Modified test so that it worked with an array being returned, which was original intention.

Added use of the module to bin/generate-configs.pl

Also moved current templates to vendor/oclc. This isn't strictly correct as there were some templates I downloaded from elsewhere, but we can sort those out later.

Author: jtgorman

.gitignore

@@ -2,3 +2,4 @@
 *cfg
 *stanza
 conf.d
+local

bin/generate-configs.pl

@@ -7,8 +7,12 @@
 use Config::General ;
 use File::Spec ;
 
+use lib 'lib' ;
+use lib '../lib' ;
+use TemplatePaths ;
 
-########################################
+
+#######################################
 ##  Start config setup
 
 my $conf = Config::General->new('ezproxy-collaborate.cfg');
@@ -37,35 +41,40 @@
     or die "Could not open $config{INCLUDE_FILE} $!" ;
 
 
-opendir(my $template_dir,  $config{TEMPLATE_DIR}) or die "Can't open template directory ( $config{TEMPLATE_DIR} ) $!" ;
-
-FILE: while( my $filepath = readdir( $template_dir ) ) {
+#opendir(my $template_dir,  $config{TEMPLATE_DIR}) or die "Can't open template directory ( $config{TEMPLATE_DIR} ) $!" ;
 
-    if( $filepath !~ /\.template$/) {
-        next FILE ;
-    }
+my @template_filepaths = TemplatePaths::template_paths_array() ;
 
-    my $id = $filepath ;
+FILE: while( my $template_info = shift @template_filepaths ) {
+    
+#    if( $filepath !~ /\.template$/) {
+#        next FILE ;
+#    }
+    
+    my $id = $template_info->{name} ;
     $id =~ s/(_i)?\.template// ;
 
     # Setup the template
-    my $template_filepath
-        = File::Spec->catfile( $config{ TEMPLATE_DIR },
-                               $filepath ) ;
+    my $template_filepath = $template_info->{path} ;
+
     my $template
         = Text::Template->new( TYPE => 'FILE',
                                SOURCE => $template_filepath ) ;
 
 
-    if( $filepath =~ /_i.template$/ && !defined($stanzas_config_ref->{ $id } ) ) {
-        warn "Institutional information needed for $id, but nothing found in stanza.cfg\n";
+    if( $template_info->{name} =~ /_i.template$/ && !defined($stanzas_config_ref->{ $id } ) ) {
+        warn "Institutional information needs to be added to stanza.cfg to correspond with the variables in the template file at $template_info->{path} \n";
     }
 
     my $text = $template->fill_in(  HASH => $stanzas_config_ref->{ $id }    ) ;
 
+    if(! defined($text) ) {
+        warn( $template_info->{path} . " seems to be an empty file, skipping " ) ;
+        next FILE ;
+    }
 
     # Setup the output file
-    my $target_filepath_init = $filepath ;
+    my $target_filepath_init = $template_info->{name} ;
     $target_filepath_init =~ s/\.template$/.stanza/ ;
 
     my $target_filepath = File::Spec->catfile($config{CONFIG_DIR},

t/TemplatePaths.t

@@ -13,7 +13,7 @@ use lib "$FindBin::Bin/lib" ;
 use TemplatePaths ;
 
 
-my $templates_ref
+my @template_paths
     = TemplatePaths::template_paths_array({vendor_dir => 't/vendor',
                                            local_dir  => 't/local',
                                        });
@@ -48,7 +48,7 @@ use Data::Dumper ;
 #diag( "Results of call: " . Dumper( $templates_ref ) . "\n\n") ;
 #diag( "Results of call: " . Dumper( $expected_ref ) . "\n\n") ;
 
-is_deeply( $templates_ref, $expected_ref ) ;
+is_deeply( \@template_paths, $expected_ref ) ;