Changeset 26756

Timestamp:

2013-01-19T22:49:04+13:00 (11 years ago)

Author:

davidb

Message:

Adjusted code for import agent so that it searches the appropriate GS collection's export for a frameset stored in its own subdirectory.

File:

• other-projects/GlamED/trunk/src/org/honours/agents/ImportCollections.java (modified) (6 diffs)

other-projects/GlamED/trunk/src/org/honours/agents/ImportCollections.java

@@ -70 +70 @@
     
     /**
-     * TODO: Change this method so we only display the full name of the collection and the collection's description (the first 10 words).
+     * Import any collection framesets found in Greenstone into GlamED.
      * @param children
      * @throws Exception
@@ -90 +90 @@
             
             if(dir.isDirectory()){
-                File exports = getExportDirectory(filename);
-                
-                if(exports != null){
-                    //Search exports folder for 0.exp, 1.exp & frame.inf
-                    String[] filesToMove = getFiles(exports);
+                
+                File outputDir = new File(filename + File.separator + "export" + File.separator + collectionName);
+                
+                if(outputDir.isDirectory()){
+                    
+                    String[] filesToMove = getFiles(outputDir);
                     
                     if(filesToMove == null){
-                        String errorMsg = "Failed to import collection " + collectionName;
+                        String errorMsg = "Failed to import collection: " + collectionName;
                         MessageBay.errorMessage("ERROR: " + errorMsg);
                         throw new Exception(errorMsg);
@@ -103 +104 @@
                     
                     File matchingFrameset = matchingFrameset(collectionName);
-                    
+
                     //Obtain first free frame for displaying collection row with links
                     Object[] freeFrameInfo = findFreeFrame();
@@ -118 +119 @@
                     
                     //Import collection into Expeditee.
-                    importIntoExpeditee(matchingFrameset,exports,collectionName,tempCollections);
-                    
+                    importIntoExpeditee(matchingFrameset,outputDir,collectionName,tempCollections);
                 }
             }
@@ -182 +182 @@
             }else{
                 tempCollections.add(collect);
-            }
-            
-            
-        }
-
+            }           
+        }
     }
     
@@ -349 +346 @@
         
         for(int j = 0; j < newChildren.length; j++){
-            if(newChildren[j].equals("export"))
-                    return new File(filename + File.separator + "export");
+            if(newChildren[j].equals("export")){
+                    String exportDir = filename + File.separator + "export";
+                    System.err.println(exportDir);
+                    return new File(exportDir);
+            }
         }