Changeset 26696 for gs3-extensions

Timestamp:

2013-01-11T18:30:22+13:00 (11 years ago)

Author:

davidb

Message:

Now obtains the correct frame number when exporting a document to an Expeditee frame.

File:

• gs3-extensions/html-to-expeditee/trunk/src/perllib/cgiactions/ExpediteeExportAction.pm (modified) (4 diffs)

gs3-extensions/html-to-expeditee/trunk/src/perllib/cgiactions/ExpediteeExportAction.pm

@@ -51 +51 @@
 {
         "generate-frame"     => { 'compulsory-args' => [ "fn", "json" ],
-                  'optional-args'   => [] }, 
+                  'optional-args'   => ['assoc'] }, 
 };
 
@@ -73 +73 @@
     my $gsdlhome  = $self->{'gsdlhome'};
 
+    my $assocfilepath = $self->{'assoc'};
+    
     my $site = $self->{'site'};
     my $collect_dir = $gsdl_cgi->get_collection_dir($site);
@@ -79 +81 @@
     
     my $json_str_unicode = $self->{'json'}; 
-    
-    my $found = $self->{'found'};
     
      if (!Encode::is_utf8( $json_str_unicode )) {
@@ -97 +97 @@
 
     my $expeditee_frame_io = new ExpediteeFrameIO($output_dir,"kgas1A");
+     $expeditee_frame_io->buildFrame($exp_frame_tree);
     
-     $expeditee_frame_io->buildFrame($exp_frame_tree);
+    my $last = 0;   #check if new frame is replacing/will be the last frame in the frameset.
+     
+     if($fn == -1){
+        #get last frame number and add 1.
+        #BUT what if a matching frame already exists for this document but we just haven't
+        #created a frameID metadata for that document yet - sol'n: at this stage, just use
+        #original code of reading file names
+        
+        my $export_dir = &util::filename_cat($collect_dir,$collect,"export");
+        my $frameInf = "$export_dir\\frame.inf";
+        my $getFn = "";
+        my @files;
+        
+        opendir DIR, $output_dir or die "cannot open output directory $output_dir: $!";
+        @files = readdir DIR;
+        closedir DIR;
+        
+        my $found = 0;
+        my $frameNumString;
+        for my $file(@files){
+            if($file =~ m/\d/){
+                
+                my $fullFile = "$export_dir\\$file";
+                open FILE, $fullFile or die $!;
+                my @lines = <FILE>;
+                my $numLines = scalar (@lines);
+                my $counter = 1;
+                
+                for my $line(@lines){
+                    
+                    if($line eq "T \@assocfilepath $assocfilepath\n"){
+                        $frameNumString = $fullFile;
+                        
+                        #extract frame number out of file name
+                        my @getFrameNumArray = split('\\\\',$frameNumString);
+                        @getFrameNumArray = reverse(@getFrameNumArray);
+                        
+                        $fn = $getFrameNumArray[0];
+                        
+                        $found = 1;
+                        
+                        if($counter == $numLines){
+                            $last = 1;
+                        }
+                    }
+                    
+                    $counter = $counter + 1;
+                }
+                
+                close(FILE);
+            }
+        }
+        
+        unless($found){
+            #try to get frame number from frame.inf.
+            if(-e $frameInf){
+                
+                open FRAME_INF, $frameInf or die $!;
+                my @lines = <FRAME_INF>;
+                
+                $fn = $lines[0];
+                
+                #get number from string
+                $fn =~ s/[^0-9]//g;
+                $fn = $fn + 1;
+                
+                $last = 1;
+            }else{
+                printf "$frameInf not found\n";
+                $fn = 1;
+                $last = 1;
+            }
+        }
+
+     }
+     
+     
      
      if($expeditee_frame_io->saveFrame("$fn.exp")){
-        #need to determine if $fn is followed by another number or $fn is the last number in the frameset.
-     
-        #if $fn is last number, write out next free frame num
-        unless($found){
-            #write out next free frame num
-            $expeditee_frame_io->saveLastFrameNumber($fn);
+        
+        printf "*** $fn";
+        
+        if($last){
+            #update last frame number
+            $expeditee_frame_io->saveLastFrameNumber($fn,$collect);
         }
-                
-        #otherwise just carry on.
         
-        $gsdl_cgi->generate_message("Item Exported to Expeditee $fn");
+        $gsdl_cgi->generate_message("Document Exported to Expeditee $fn");
      }else{
         $gsdl_cgi->generate_error("Failed to save frame number $fn");