Changeset 26638

Timestamp:

2013-01-09T23:37:51+13:00 (11 years ago)

Author:

davidb

Message:

Changes made to take into account that thumbnail images contain "thumbnail." at the beginning of the filename, when adding these thumbnails to a frame (for the Collection Space feature).

File:

• other-projects/GlamED/trunk/src/org/honours/CollectionSpace/CollectionSpace.java (modified) (3 diffs)

other-projects/GlamED/trunk/src/org/honours/CollectionSpace/CollectionSpace.java

@@ -14 +14 @@
 import org.expeditee.items.Picture;
 import org.expeditee.items.Text;
+import org.honours.agents.GenerateThumbnails;
 import org.honours.collection.Collection;
 import org.honours.gui.HonoursFrameIO;
@@ -45 +46 @@
         _associatedCollection = associatedCollection;
         _name = "collectionspace-" + _associatedCollection.getName();
-        _thumbnailsDirectory = FrameIO.IMAGES_FOLDER + "thumbnails-" +
+        _thumbnailsDirectory = "expeditee" + File.separator + "thumbnails-" +
         _associatedCollection.getName();
     }
@@ -78 +79 @@
         try{
             
-            if(_thumbnailsDirectory == null){
-                
-                MessageBay.errorMessage("ERROR: No thumbnails directory set up so" +
-                        " cannot generate CollectionSpace");
-
-                return;
-            }
-
-            //generate actual collectionSpace frameset using _name.
-            createCollectionSpace();
-            
-            //Open thumbnails.info file.
-            BufferedReader br = new BufferedReader(new FileReader(
-                    _thumbnailsDirectory + File.separator +
-                    "thumbnails.info"));
-            String line;
-            
-            while((line = br.readLine()) != null){
-                
-                String[] split = line.split(",");
-                
-                //1st entry in split is filename, 2nd is associated frame name.
-                Text imageSource = new Text("@i: " + split[0] + " 1.0");
-                Picture newPic = PictureInformation.getPicture(imageSource);
-                newPic.setLink(split[1]);
-                _thumbnails.add(newPic);
-            }
-            br.close();
-            
-            writeThumbnails();
-            
-            MessageBay.displayMessage("Collection Space generated!");
-            
-            Navigation.Goto(_name + "1");
-            
-            }catch(Exception e){
-                e.printStackTrace();
-            }
+        if(_thumbnailsDirectory == null){
+            
+            MessageBay.errorMessage("ERROR: No thumbnails directory set up so cannot generate CollectionSpace. Try running the GenerateThumbnails agent first before generating the Collection Space.");
+            
+            return;
+        }
+
+        if(!new File(_thumbnailsDirectory).exists()){
+            GenerateThumbnails gt = new GenerateThumbnails();
+            Frame toLoad = FrameIO.LoadFrame(_associatedCollection + "1");
+            System.err.println("*** _associatedCollection = " + _associatedCollection);
+            System.err.println("*** toLoad = " + toLoad);
+            gt.process(FrameIO.LoadFrame(_associatedCollection.getName() + "1"));
+        }
+        
+        //generate actual collectionSpace frameset using _name.
+        createCollectionSpace();
+        
+        //Open thumbnails.inf file.
+        BufferedReader br = new BufferedReader(new FileReader(
+                _thumbnailsDirectory + File.separator +
+                "thumbnails.inf"));
+        String line;
+        
+        while((line = br.readLine()) != null){
+            
+            String[] split = line.split(",");
+            
+            //1st entry in split is filename, 2nd is associated frame name.
+            Text imageSource = new Text("@i: " + split[0] + " 1.0");
+            Picture newPic = PictureInformation.getPicture(imageSource);
+            
+            //Remove "thumbnail." from value in split[1].
+            //String picLink = split[1].substring("thumbnail.".length());
+            
+            newPic.setLink(split[1]);
+            //newPic.setLink(picLink);
+            _thumbnails.add(newPic);
+        }
+        br.close();
+        
+        writeThumbnails();
+        
+        MessageBay.displayMessage("Collection Space generated!");
+        
+        Navigation.Goto(_name + "1");
+        
+        }catch(Exception e){
+            e.printStackTrace();
+        }
         
     }