Changeset 12902

Timestamp:

2006-09-28T16:01:05+12:00 (18 years ago)

Author:

kjdon

Message:

tidied up saveRecords a bit. SRWDownload now uses filename_cat instead of foreward slashes.

Location:

trunk/gsdl/perllib/downloaders

Files:

• SRWDownload.pm (modified) (1 diff)
• Z3950Download.pm (modified) (1 diff)

trunk/gsdl/perllib/downloaders/SRWDownload.pm

@@ -137 +137 @@
     $host =~ s/http:\/\///;
     $strOutputDir  =~ s/"//g; #"
-    my $strFileURL = "$strOutputDir/$host/$strFileName.xml";
-  
+    my $strOutputFile = &util::filename_cat($strOutputDir,$host,"$strFileName.xml");
+ 
     # prepare subdirectory for record (if needed)
 
-    my ($strSubDirPath,$unused) = $self->dirFileSplit($strFileURL);
+    my ($strSubDirPath,$unused) = $self->dirFileSplit($strOutputFile);
     &util::mk_all_dir($strSubDirPath);
 
-    my $ds = &util::get_dirsep();
-  
-    print STDERR "Saving records to \"$strFileURL\"\n";
+   print STDERR "Saving records to \"$strOutputFile\"\n";
 
     # save record 
-    open (ZOUT,">$strFileURL")
+    open (ZOUT,">$strOutputFile")
     || die "Unable to save oai metadata record: $!\n";
     print ZOUT $strRecords;

trunk/gsdl/perllib/downloaders/Z3950Download.pm

@@ -239 +239 @@
     $strOutputDir  =~ s/"//g; #"
 
-    my $strFileURL = "$strOutputDir/$self->{'host'}/$strFileName.marc";
+    my $strOutputFile = &util::filename_cat($strOutputDir,$self->{'host'},"$strFileName.marc");
+     # prepare subdirectory for record (if needed)
+    my ($strSubDirPath,$unused) = $self->dirFileSplit($strOutputFile);
+ 
+    &util::mk_all_dir($strSubDirPath);
   
-    # prepare subdirectory for record (if needed)
-    my ($strSubDirPath,$unused) = $self->dirFileSplit($strFileURL);
- 
-    &util::mk_all_dir($strSubDirPath);
-
-    my $ds = &util::get_dirsep();
-    my $strOutputFile = &util::filename_cat($strOutputDir,$self->{'host'},"$strFileName.marc");
-   
     print STDERR "Saving records to \"$strOutputFile\"\n";