Changeset 18358 for gli/branches

Timestamp:

2009-01-12T11:18:22+13:00 (15 years ago)

Author:

kjdon

Message:

updated the rtl-gli branch with files from trunk. Result of a merge 14807:18318

Location:

gli/branches/rtl-gli/src/org/greenstone/gatherer/collection

Files:

• BasicCollectionConfiguration.java (modified) (3 diffs)
• Collection.java (modified) (5 diffs)
• CollectionManager.java (modified) (33 diffs)
• CollectionTree.java (modified) (9 diffs)
• CollectionTreeNode.java (modified) (4 diffs)
• ScriptOptions.java (modified) (2 diffs)

gli/branches/rtl-gli/src/org/greenstone/gatherer/collection/BasicCollectionConfiguration.java

@@ -56 +56 @@
     private String name = "";
     private String is_public = "";
+    private String collectgroup = "false";
     
     private String site = null; // used for gs3 colls
@@ -95 +96 @@
             else if(command_type_str.equals(StaticStrings.COLLECTIONMETADATA_MAINTAINER_STR)) {
                 maintainer = tokenizer.nextToken();
+            }
+            else if(command_type_str.equals(StaticStrings.COLLECTIONMETADATA_COLLECTGROUP_STR)) {
+                collectgroup = tokenizer.nextToken();
             }
             else if(command_type_str.equalsIgnoreCase(StaticStrings.COLLECTIONMETADATA_STR)) {
@@ -228 +232 @@
     return is_public;
     }
+
+    public String getCollectGroup() {
+    return collectgroup;
+    }
     
     /** Retrieve the short name for this collection which, given this current file is in <col_name>/etc/collect.cfg, is the name of this file's parent file's parent.

gli/branches/rtl-gli/src/org/greenstone/gatherer/collection/Collection.java

@@ -62 +62 @@
     /** A reference to the import ScriptOptions. */
     public ScriptOptions import_options;
+    /** A reference to the schedule ScriptOptions */ 
+    public ScriptOptions schedule_options; 
     /** true if an error has occurred during construction */
     public boolean error = false;
@@ -86 +88 @@
     /** The name of the import element. */
     static final private String IMPORT = "Import";
+    /** The name of the schedule element. */
+    static final private String SCHEDULE = "Schedule"; 
+    /** The name of the export element. */
+    static final private String EXPORT = "Export";
     /** The name of the imported attribute. */
     static final private String IMPORTED = "imported";
@@ -111 +117 @@
     }
     // Finally create all of the child managers that are directly dependant on a collection
-    build_options = new ScriptOptions(getBuildValues(), "buildcol.pl");
-    import_options = new ScriptOptions(getImportValues(), "import.pl");
+
+    if (Configuration.fedora_info.isActive()) {
+        build_options = new ScriptOptions(getValues(BUILD), "g2f-buildcol.pl");
+        import_options = new ScriptOptions(getValues(IMPORT), "g2f-import.pl");
+    }
+    else {
+        build_options = new ScriptOptions(getBuildValues(), "buildcol.pl");
+        import_options = new ScriptOptions(getImportValues(), "import.pl");
+        schedule_options = new ScriptOptions(getScheduleValues(), "schedule.pl");
+    }
     }
     
@@ -334 +348 @@
     
 
+    /** Method to retrieve the current import/build/export/whatever options associated with this Collection. */
+    private Element getValues(String val_type) {
+    Element values_element = null;
+    try {
+        Element document_element = document.getDocumentElement();
+        Element config_element = (Element) XMLTools.getNodeFromNamed(document_element, BUILD_CONFIG);
+        values_element = (Element) XMLTools.getNodeFromNamed(config_element, val_type);
+        config_element = null;
+        document_element = null;
+    }
+    catch (Exception error) {
+        DebugStream.printStackTrace(error);
+    }
+    return values_element;
+    }
+
     
     /** Method to retrieve the current build options associated with this Collection. */
@@ -349 +379 @@
     }
     return build_values_element;
+    }
+
+    private Element getScheduleValues() {
+    Element schedule_values_element = null;
+    try {
+        Element document_element = document.getDocumentElement();
+        Element build_config_element = (Element) XMLTools.getNodeFromNamed(document_element, BUILD_CONFIG);
+        schedule_values_element = (Element) XMLTools.getNodeFromNamed(build_config_element, SCHEDULE);
+        build_config_element = null;
+        document_element = null;
+    }
+    catch (Exception error) {
+        DebugStream.printStackTrace(error);
+    } 
+    return schedule_values_element;
     }
     

gli/branches/rtl-gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -76 +76 @@
 import org.w3c.dom.*;
 
-/** This class manages many aspects of the collection, from its creation via scripts, data access via methods and its importing and building into the final collection. It is also resposible for firing appropriate event when significant changes have occured within the collection, and for creating a new metadata set manager as necessary.
+/** This class manages many aspects of the collection, from its creation via scripts, data access via methods and its importing and building into the final collection. It is also responsible for firing appropriate event when significant changes have occured within the collection, and for creating a new metadata set manager as necessary.
  * @author John Thompson
  * @version 2.3
@@ -87 +87 @@
     /** Are we currently in the process of importing? */
     static private boolean importing = false;
+    /** Are we currently in the process of scheduling? */ 
+    static private boolean scheduling = false; 
     /** The objects listening for CollectionContentsChanged events. */
     static private ArrayList collection_contents_changed_listeners = new ArrayList();
@@ -97 +99 @@
     /** An inner class listener responsible for noting tree changes and resetting saved when they occur. */
     static private FMTreeModelListener fm_tree_model_listener = null;
-    /** The monitor resposible for parsing the build process. */
+    /** The monitor responsible for parsing the build process. */
     static private GShellProgressMonitor build_monitor = null;
-    /** The monitor resposible for parsing the import process. */
+    /** The monitor responsible for parsing the import process. */
     static private GShellProgressMonitor import_monitor = null;
+    /** The monitor responsible for parsing the scheduler process. */ 
+    static private GShellProgressMonitor schedule_monitor = null; 
 
     /** The name of the standard lock file. */
@@ -109 +113 @@
     /** Used to indicate the source of the message is the building methods. */
     static final public int BUILDING  = 5;
+    /** Used to indicate the source of the message is in the scheduling methods...?  */ 
+    static final public int SCHEDULING = 7; 
 
   
@@ -116 +122 @@
     this.building = false;
     this.importing = false;
+    this.scheduling = false; 
     this.collection = null;
 
@@ -159 +166 @@
         command_parts_list.add("-S");
     }
-    command_parts_list.add(LocalGreenstone.getBinScriptDirectoryPath() + "buildcol.pl");
+
+    if (Configuration.fedora_info.isActive()) {
+        command_parts_list.add(LocalGreenstone.getBinScriptDirectoryPath() + "g2f-buildcol.pl");
+
+        command_parts_list.add("-hostname");
+        command_parts_list.add(Configuration.fedora_info.getHostname());
+
+        command_parts_list.add("-port");
+        command_parts_list.add(Configuration.fedora_info.getPort());
+
+        command_parts_list.add("-username");
+        command_parts_list.add(Configuration.fedora_info.getUsername());
+
+        command_parts_list.add("-password");
+        command_parts_list.add(Configuration.fedora_info.getPassword());
+
+        command_parts_list.add("-protocol");
+        command_parts_list.add(Configuration.fedora_info.getProtocol());
+
+    }
+    else {
+        command_parts_list.add(LocalGreenstone.getBinScriptDirectoryPath() + "buildcol.pl");
+    }
     command_parts_list.add("-gli");
     command_parts_list.add("-language");
@@ -187 +216 @@
     }
 
+    /*probably repeating alot of work, but I want to keep this separate... wendy*/
+    public void scheduleBuild(boolean incremental_build)
+    {
+
+    DebugStream.println("In CollectionManager.scheduleBuild(), incremental_build: " + incremental_build); 
+    DebugStream.println("Is event dispatch threa: " + SwingUtilities.isEventDispatchThread()); 
+
+    ArrayList sched_list = new ArrayList(); 
+    if ((Utility.isWindows()) && (!Gatherer.isGsdlRemote)) {
+        sched_list.add(Configuration.perl_path);
+        sched_list.add("-S");
+    }
+    sched_list.add(LocalGreenstone.getBinScriptDirectoryPath() + "schedule.pl"); 
+    sched_list.add("-colname"); 
+    sched_list.add(collection.getName()); 
+    sched_list.add("-gli"); 
+
+    // First, generate the import.pl command, also converting to a string
+    // Generate the import.pl command
+    ArrayList import_list = new ArrayList();
+    if ((Utility.isWindows()) && (!Gatherer.isGsdlRemote)) {
+        import_list.add(Configuration.perl_path);
+        import_list.add("-S");
+    }
+        import_list.add(LocalGreenstone.getBinScriptDirectoryPath() + "import.pl");
+    import_list.add("-language");
+    import_list.add(Configuration.getLanguage());
+    import_list.add("-collectdir");
+    import_list.add(getCollectDirectory());
+
+    String[] import_options = collection.import_options.getValues();
+    int i = 0; 
+    for (i = 0; i < import_options.length; i++) {
+        import_list.add(import_options[i]);
+    }
+
+    import_list.add(collection.getName());  
+
+    String[] import_parts = (String[]) import_list.toArray(new String[0]); 
+    String command = "";
+    i = 0; 
+    for (i = 0; i < import_parts.length-1; i++) {
+        command = command + import_parts[i] + " "; 
+    } 
+    command = command + import_parts[i]; 
+
+    sched_list.add("-import"); 
+    sched_list.add("\"" + command + "\""); 
+
+    // Generate the buildcol.pl command, also converting to a string
+    ArrayList build_list = new ArrayList();
+
+    // i'm not doing this in schedule.pl right now - should i be? 
+    if ((Utility.isWindows()) && (!Gatherer.isGsdlRemote)) {
+        build_list.add(Configuration.perl_path);
+        build_list.add("-S");
+    }
+    build_list.add(LocalGreenstone.getBinScriptDirectoryPath() + "buildcol.pl");
+    build_list.add("-language");
+    build_list.add(Configuration.getLanguage());
+    build_list.add("-collectdir");
+    build_list.add(getCollectDirectory());
+
+    // If the user hasn't manually specified "-keepold" or "-removeold" then pick one based on incremental_build
+    if (!collection.build_options.getValueEnabled("keepold") && !collection.build_options.getValueEnabled("removeold")) {
+        build_list.add(incremental_build ? "-keepold" : "-removeold");
+    }
+
+    String[] build_options = collection.build_options.getValues();
+    for (i = 0; i < build_options.length; i++) {
+        build_list.add(build_options[i]);
+    }
+
+    build_list.add(collection.getName());
+    
+    //build actual string
+    String[] build_parts = (String[]) build_list.toArray(new String[0]);
+    String command2 = "";
+        for(i = 0; i < build_parts.length-1; i++) {
+            command2 = command2 + build_parts[i] + " ";
+        }
+    command2 = command2 + build_parts[i]; 
+
+    sched_list.add("-build"); 
+    sched_list.add("\"" + command2 + "\""); 
+    
+    //next, the scheduling frequency goes here
+    String[] schedule_options = collection.schedule_options.getValues();  
+    for(i = 0; i < schedule_options.length; i++) { 
+        sched_list.add(schedule_options[i]); 
+    }
+
+    //now, hope it will run. ;) 
+    String[] sched_parts = (String[]) sched_list.toArray(new String[0]); 
+
+        GShell shell = new GShell(sched_parts, GShell.SCHEDULE, SCHEDULING, this, schedule_monitor, GShell.GSHELL_SCHEDULE);
+    shell.addGShellListener(Gatherer.g_man.create_pane);
+    shell.addGShellListener(Gatherer.g_man.format_pane);
+    shell.start();
+    }
 
     /** Used to determine whether the currently active collection has been built.
@@ -193 +322 @@
     public boolean built() {
     if(collection != null) {
-        // Determine if the collection has been built by looking for the build.cfg or buildConfig.xml file
-        String file_name = (Gatherer.GS3)? Utility.BUILD_CONFIG_XML : Utility.BUILD_CFG;
-        File build_cfg_file = new File(getLoadedCollectionIndexDirectoryPath() + file_name);
-        return build_cfg_file.exists();
+        // Determine if the collection has been built by looking for the build.cfg (gs2) 
+        // buildConfig.xml (gs3) or export.inf (fedora) file
+        String file_name = "";
+        
+        if (Configuration.fedora_info.isActive()) { // FLI case
+        // Fedora build
+        //file_name = getLoadedCollectionArchivesDirectoryPath() + "import.inf";
+        file_name = getLoadedCollectionExportDirectoryPath() + "export.inf";
+        } else { 
+        // GLI is running, check if it's greenstone 3 or greenstone 2
+        if (Gatherer.GS3) { // GS3 GLI
+            file_name = getLoadedCollectionIndexDirectoryPath() + Utility.BUILD_CONFIG_XML;
+        }
+        else { // greenstone 2 GLI
+            file_name = getLoadedCollectionIndexDirectoryPath() + Utility.BUILD_CFG;           
+        }
+        }
+        File test_file = new File(file_name);
+        return test_file.exists();
     }
     return false;
@@ -235 +379 @@
     // Remove the lock file on the server
     if (Gatherer.isGsdlRemote) {
-        RemoteGreenstoneServer.deleteCollectionFile(collection.getName(), lock_file);
+        Gatherer.remoteGreenstoneServer.deleteCollectionFile(collection.getName(), lock_file);
     }
 
@@ -380 +524 @@
         if (!new File(collection_directory_path).exists()) {
         // If there is no collection directory then the creation was unsuccessful, or cancelled
-
+          
         return;
         }
@@ -403 +547 @@
         collection_import_directory.mkdirs();
         if (Gatherer.isGsdlRemote) {
-            RemoteGreenstoneServer.newCollectionDirectory(name, collection_import_directory);
+            Gatherer.remoteGreenstoneServer.newCollectionDirectory(name, collection_import_directory);
         }
         }
@@ -413 +557 @@
         collection.import_options.setValue("removeold", true, null);
 
+        // for remote case, scheduling causes an Exception on creating a new collection that 
+        // can't be recovered from. For GS3, it doesn't work since it it trying to access etc/main.cfg
+        if (canDoScheduling()) {
+        scheduling();
+        }
+                
         MetadataSetManager.clearMetadataSets();
         MetadataXMLFileManager.clearMetadataXMLFiles();
@@ -431 +581 @@
         if (Gatherer.isGsdlRemote) {
             String base_collection_name = base_collection_directory.getName();
-            RemoteGreenstoneServer.downloadCollection(base_collection_name);
+            Gatherer.remoteGreenstoneServer.downloadCollection(base_collection_name);
         }
 
@@ -513 +663 @@
         DebugStream.printStackTrace(error);
     }
+    }
+
+    private void scheduling() 
+    throws Exception
+    {
+    //try to obtain email address of collection owner if it exists... 
+    String stmp = Configuration.getEmail(); 
+    if(stmp != null) {
+        collection.schedule_options.setValue("toaddr", false, Configuration.getEmail());
+    }
+    
+    //The next few items deal with updating the SMTP server, and the to: and from: addresses
+    //from main.cfg and the collection configuration. if no changes are made, or the 
+    //values are result to NULL, any existing values are kept. 
+
+    //try to obtain email address of Greenstone installation webmaster for - used to indicate "sender". 
+    File mcfg = new File(LocalGreenstone.getDirectoryPath() + File.separator + "etc" + File.separator + "main.cfg");
+    BufferedReader maincfg = new BufferedReader(new FileReader(mcfg));      
+        stmp = "";
+        String fromaddr = ""; 
+        while((stmp = maincfg.readLine()) != null) { 
+        if(stmp.startsWith("maintainer")) {
+               fromaddr = stmp.substring(10); //length of MailServer 
+           fromaddr = fromaddr.trim();  
+           break; 
+        }
+        }
+        maincfg.close(); 
+        if(!fromaddr.equals("NULL") && !fromaddr.equals("null")) {
+        collection.schedule_options.setValue("fromaddr", false, fromaddr);      
+        }
+
+        //try to obtain an smtp server address from main.cfg. If that fails,
+        //try mail.server if an email address exists. If that fails,
+        //maybe a message to set attribute in main.cfg? 
+        //i'm pretty sure there exists functionality to do this, but 
+        //i'll finish this faster if I just wrote it
+
+
+        maincfg = new BufferedReader(new FileReader(mcfg));       
+        String smtptmp = "NULL";
+        while((stmp = maincfg.readLine()) != null) { 
+        if(stmp.startsWith("MailServer")) {
+               smtptmp = stmp.substring(10); //length of MailServer 
+           smtptmp = smtptmp.trim(); 
+           break; 
+        }
+        }
+            maincfg.close();
+
+            //try if lookup fails
+            if(smtptmp.equals("NULL") || smtptmp.equals("null")) {
+        String email2=fromaddr; 
+        if(!email2.equals("NULL") && !email2.equals("null")) {
+            int loc = email2.indexOf('@'); 
+            email2 = email2.substring(loc+1); 
+            smtptmp = "mail."+email2;
+            }
+            }
+        if(!smtptmp.equals("NULL") && !smtptmp.equals("null")) { 
+        collection.schedule_options.setValue("smtp", false, smtptmp);
+        }
+
     }
 
@@ -552 +765 @@
     // Delete the collection on the server if we're using a remote Greenstone
     if (Gatherer.isGsdlRemote) {
-        RemoteGreenstoneServer.deleteCollection(collection_name);
-    }
-
+        Gatherer.remoteGreenstoneServer.deleteCollection(collection_name);
+    }
+
+    // if Greenstone3, need to deactivate the collection on the server
+    if (Gatherer.GS3) {
+        Gatherer.configGS3Server(Configuration.site_name, ServletConfiguration.DEACTIVATE_COMMAND + collection_name);
+    }
+    
     // Now delete the collection directory
     return Utility.delete(new File(getCollectionDirectoryPath(collection_name)));
@@ -591 +809 @@
     return getLoadedCollectionDirectoryPath() + "archives" + File.separator;
     }
+
+    /** Returns the absolute filename of the loaded collection's export directory.
+     */
+    static public String getLoadedCollectionExportDirectoryPath()
+    {
+    return getLoadedCollectionDirectoryPath() + "export" + File.separator;
+    }
+
 
 
@@ -764 +990 @@
         command_parts_list.add("-S");
     }
-    command_parts_list.add(LocalGreenstone.getBinScriptDirectoryPath() + "import.pl");
+
+    if (Configuration.fedora_info.isActive()) {
+        command_parts_list.add(LocalGreenstone.getBinScriptDirectoryPath() + "g2f-import.pl");
+
+        command_parts_list.add("-hostname");
+        command_parts_list.add(Configuration.fedora_info.getHostname());
+
+        command_parts_list.add("-port");
+        command_parts_list.add(Configuration.fedora_info.getPort());
+
+        command_parts_list.add("-username");
+        command_parts_list.add(Configuration.fedora_info.getUsername());
+
+        command_parts_list.add("-password");
+        command_parts_list.add(Configuration.fedora_info.getPassword());
+
+        command_parts_list.add("-protocol");
+        command_parts_list.add(Configuration.fedora_info.getProtocol());
+    }
+    else {
+        command_parts_list.add(LocalGreenstone.getBinScriptDirectoryPath() + "import.pl");
+    }
+
     command_parts_list.add("-gli");
     command_parts_list.add("-language");
@@ -808 +1056 @@
         // If we're using a remote Greenstone server, upload the metadata file
         if (Gatherer.isGsdlRemote) {
-            RemoteGreenstoneServer.uploadCollectionFile(collection.getName(), metadata_set_file);
+            Gatherer.remoteGreenstoneServer.uploadCollectionFile(collection.getName(), metadata_set_file);
         }
         }
@@ -874 +1122 @@
     if (Gatherer.isGsdlRemote) {
         String collection_name = location.substring(location.lastIndexOf(File.separator) + 1, location.length() - ".col".length());
-        if (RemoteGreenstoneServer.downloadCollection(collection_name).equals("")) {
+        if (Gatherer.remoteGreenstoneServer.downloadCollection(collection_name).equals("")) {
         return;
         }
@@ -959 +1207 @@
         System.err.println("Cannot write lock file!");
         String args[] = new String[2];
-        args[0] = location;
-        args[1] = Dictionary.get("FileActions.Write_Not_Permitted_Title");
+        args[0] = location;     
+        args[1] = Dictionary.get("FileActions.Write_Not_Permitted_Message", new String[]{lock_file.getAbsolutePath()});     
+        if(Gatherer.client_operating_system.toUpperCase().indexOf("WINDOWS")!=-1){        
+          //if(Gatherer.client_operating_system.toUpperCase().indexOf("VISTA")!=-1){            
+            args[1] += Dictionary.get("FileActions.File_Permission_Detail", new String[]{Configuration.gsdl_path, System.getProperty("user.name")});
+          //} 
+        }
         JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CollectionManager.Cannot_Open_With_Reason", args), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
         args = null;
         return;
         }
-
+        
+        if (canDoScheduling()) {
+        //THIS LOOKS LIKE THE BEST PLACE TO TRY AND UPDATE .col FILES FOR EXISTING COLLECTIONS...Wendy
+ 
+        //First, see if "Schedule" exists in the XMl File... 
+        BufferedReader bir = new BufferedReader(new FileReader(collection_file)); 
+        boolean flag = false; 
+        try {
+            String stmp = new String(); 
+           
+            while((stmp = bir.readLine()) != null) {
+            stmp = stmp.trim();  
+            if(stmp.equals("<Schedule>") || stmp.equals("<Schedule/>")) {
+                flag = true; 
+                break; 
+            }
+            }
+            bir.close(); 
+            
+        } catch (IOException ioe) {
+            DebugStream.printStackTrace(ioe);
+        }
+        
+        //modify if old .col (i.e. no Schedule exists in XML file)
+        if(!flag) {
+            File new_collection_file = new File(collection_directory.getAbsolutePath() + "/tmp.col");
+            
+            
+            BufferedWriter bor = new BufferedWriter(new FileWriter(new_collection_file)); 
+            bir = new BufferedReader(new FileReader(collection_file)); 
+            
+            try { 
+            String stmp = new String(); 
+            while((stmp = bir.readLine()) != null) {
+                String stmp2 = stmp.trim(); 
+                if(stmp2.startsWith("<!ELEMENT Argument")) {
+                bor.write("  <!ELEMENT Schedule          (Arguments*)>\n");                
+                }
+                else if(stmp2.equals("</BuildConfig>")) {
+                bor.write("      <Schedule/>\n"); 
+                }
+                
+                bor.write(stmp + "\n"); 
+                
+            }
+            bir.close(); 
+            bor.close();
+            } catch (IOException ioe) {  
+            DebugStream.printStackTrace(ioe);
+            }  
+            
+            //copy over tmp.col to replace 
+            try { 
+            collection_file.delete();
+            new_collection_file.renameTo(collection_file); 
+            } catch (Exception e) { 
+            DebugStream.printStackTrace(e);
+            } 
+        }
+        }
+        
         // Open the collection file
         this.collection = new Collection(collection_file);
@@ -976 +1289 @@
         throw(new Exception(Dictionary.get("CollectionManager.Missing_Config"))); // this error message does not agree with the error
         }
-
+        
+        if (canDoScheduling()) {
+        scheduling();
+        }
+      
             MetadataSetManager.clearMetadataSets();
         MetadataSetManager.loadMetadataSets(collection_metadata_directory);
@@ -997 +1314 @@
         MetadataXMLFileManager.loadMetadataXMLFiles(collection_import_directory,collection.toSkimFile());
 
-        // Read through the doc.xml files in the archives directory
-        File collection_archives_directory = new File(getLoadedCollectionArchivesDirectoryPath());
+        
+        // get rid of the previous scan through docxml files
         DocXMLFileManager.clearDocXMLFiles();
-        DocXMLFileManager.loadDocXMLFiles(collection_archives_directory);
+
+        if (Configuration.fedora_info.isActive()) { // FLI case
+        // Read through the docmets.xml files in the export directory
+        File collection_export_directory = new File(getLoadedCollectionExportDirectoryPath());
+        DocXMLFileManager.loadDocXMLFiles(collection_export_directory,"docmets.xml");
+        }
+        else {
+        // Read through the doc.xml files in the archives directory
+        File collection_archives_directory = new File(getLoadedCollectionArchivesDirectoryPath());
+        DocXMLFileManager.loadDocXMLFiles(collection_archives_directory,"doc.xml");
+        }
+
 
         // Get a list of the collection specific classifiers and plugins
@@ -1019 +1347 @@
         // There is obviously no existing collection present.
         DebugStream.printStackTrace(error);
+        error.printStackTrace();
         if(error.getMessage() != null) {
         String[] args = new String[2];
-        args[0] = location;
-        args[1] = error.getMessage();
+        args[0] = location;     
+        //args[1] = error.getMessage();
+        args[1] = "The Librarian Interface does not have permission to write to... Please check file permissions.";
         JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CollectionManager.Cannot_Open_With_Reason", args), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
         }
@@ -1035 +1365 @@
     }
 
+    /** At present, scheduling only works for GS2, only when GS2 is local and only when GLI runs from
+     * within a GS2 installation. This method can be adjusted as scheduling becomes available for more
+     * more situations. */
+    public static boolean canDoScheduling() {
+    // Would be nice to support more of these, rather than returning false
+    if(Gatherer.isGsdlRemote) {
+        return false;
+    } 
+    if(Gatherer.GS3) {
+        return false;
+    }
+    if (Configuration.fedora_info.isActive()) {
+        return false;
+    }
+
+    // GS2's etc/main.cfg is necessary for scheduling, but scheduling looks for it locally: 
+    // it assumes GLI is inside a GS2 installation
+    File mcfg = new File(LocalGreenstone.getDirectoryPath() + File.separator + "etc" + File.separator + "main.cfg");
+    if(!mcfg.exists()) {
+        System.out.println("Cannot do scheduling, since there is no file: " + mcfg.getAbsolutePath() 
+                   + ".\nScheduling presently depends on GLI running from inside a GS2.");
+        return false;
+    }
+    
+    return true;
+    }
 
     private void makeCollection(String name, String email)
@@ -1045 +1401 @@
     }
     command_parts_list.add(LocalGreenstone.getBinScriptDirectoryPath() + "mkcol.pl");
-    command_parts_list.add((Gatherer.GS3) ? Utility.GS3MODE_ARGUMENT : "");// add '-gs3mode' 
+    if(Gatherer.GS3) {
+        command_parts_list.add(Utility.GS3MODE_ARGUMENT); // add '-gs3mode' 
+    }
 
     command_parts_list.add("-collectdir");
@@ -1062 +1420 @@
     // Run the mkcol.pl command
     String[] command_parts = (String[]) command_parts_list.toArray(new String[0]);
+    //for(int i = 0; i < command_parts.length; i++) {
+    ///ystem.err.println("\""+command_parts[i]+"\"");
+    //}
     
     GShell process = new GShell(command_parts, GShell.NEW, COLLECT, this, null, GShell.GSHELL_NEW);
@@ -1072 +1433 @@
      */
     public synchronized void message(GShellEvent event) {
+      
     }
 
@@ -1123 +1485 @@
         buildCollection(false);
     }
+    else if(event.getType() == GShell.SCHEDULE && event.getStatus() == GShell.OK ) {
+
+        WarningDialog collection_built_warning_dialog = new WarningDialog("warning.ScheduleBuilt", Dictionary.get("ScheduleBuilt.Title"), Dictionary.get("ScheduleBuilt.Message"), null, false);
+        collection_built_warning_dialog.setMessageOnly(true); // Not a warning
+        collection_built_warning_dialog.display();
+        collection_built_warning_dialog.dispose();
+        collection_built_warning_dialog = null;   
+    } 
     // If we were running a build, now is when we move files across.
     else if(event.getType() == GShell.BUILD && event.getStatus() == GShell.OK) {
@@ -1159 +1529 @@
         Gatherer.g_man.repaint();
     }
-    else if (event.getStatus() == GShell.ERROR) {
-        DebugStream.println("There was an error in the gshell:"+ event.getMessage());
-        if (event.getType() == GShell.NEW) {
-        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CollectionManager.Cannot_Create_Collection"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
-        } else {
+    else if (event.getStatus() == GShell.ERROR) {       
+        if (event.getType() == GShell.NEW) {     
+          String name = event.getMessage();
+          String collectDir = getCollectionDirectoryPath(name);
+          String errMsg = "";
+          if (!new File(getCollectionDirectoryPath(name)).exists() || !new File(getCollectionDirectoryPath(name)).canWrite()) {       
+        String reason = Dictionary.get("FileActions.Write_Not_Permitted_Message", new String[]{collectDir});
+        errMsg = Dictionary.get("CollectionManager.Cannot_Create_Collection_With_Reason", new String[]{reason});
+        if(Gatherer.client_operating_system.toUpperCase().indexOf("WINDOWS") != -1){          
+          //if(Gatherer.client_operating_system.toUpperCase().indexOf("VISTA")!=-1){            
+            errMsg += Dictionary.get("FileActions.File_Permission_Detail", new String[]{Configuration.gsdl_path, System.getProperty("user.name")});
+          //} 
+        }
+          } else {
+        errMsg = Dictionary.get("CollectionManager.Cannot_Create_Collection");
+          }
+          JOptionPane.showMessageDialog(Gatherer.g_man, errMsg, Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+        } 
+        else if(event.getType() == GShell.SCHEDULE) { 
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CollectionManager.Schedule_Failed"), Dictionary.get("CollectionManager.Schedule_Ready_Title"), JOptionPane.ERROR_MESSAGE);
+        }
+        else {
         JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CollectionManager.Preview_Ready_Failed"), Dictionary.get("CollectionManager.Preview_Ready_Title"), JOptionPane.ERROR_MESSAGE);
         Gatherer.refresh(Gatherer.COLLECTION_REBUILT);
@@ -1199 +1586 @@
     }
 
+    public void registerScheduleMonitor(GShellProgressMonitor monitor) { 
+    schedule_monitor = monitor; 
+    }
+
 
     static public void removeCollectionContentsChangedListener(CollectionContentsChangedListener listener)
@@ -1227 +1618 @@
         // If we're using a remote Greenstone server, delete the metadata file on the server
         if (Gatherer.isGsdlRemote) {
-        RemoteGreenstoneServer.deleteCollectionFile(collection.getName(), metadata_set_file);
+        Gatherer.remoteGreenstoneServer.deleteCollectionFile(collection.getName(), metadata_set_file);
         }
     }
@@ -1317 +1708 @@
     private boolean installCollection()
     {
+    if (Configuration.fedora_info.isActive()) {
+        DebugStream.println("Fedora build complete. No need to move files.");
+        return true;
+    }
+
+       
     DebugStream.println("Build complete. Moving files.");
 
@@ -1353 +1750 @@
 
         if (Gatherer.isGsdlRemote) {
-            RemoteGreenstoneServer.deleteCollectionFile(collection.getName(), new File(getLoadedCollectionIndexDirectoryPath()));
-            RemoteGreenstoneServer.moveCollectionFile(collection.getName(), new File(getLoadedCollectionBuildingDirectoryPath()), new File(getLoadedCollectionIndexDirectoryPath()));
+            Gatherer.remoteGreenstoneServer.deleteCollectionFile(
+                             collection.getName(), new File(getLoadedCollectionIndexDirectoryPath()));
+            Gatherer.remoteGreenstoneServer.moveCollectionFile(collection.getName(), 
+                    new File(getLoadedCollectionBuildingDirectoryPath()), new File(getLoadedCollectionIndexDirectoryPath()));
         }
 

gli/branches/rtl-gli/src/org/greenstone/gatherer/collection/CollectionTree.java

@@ -99 +99 @@
         JLabel tree_cell = (JLabel) super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus);
 
-        // Mark explodable files with a different icon
-        if (value instanceof CollectionTreeNode && ((CollectionTreeNode) value).isExplodable()) {
-        tree_cell.setIcon(CollectionTreeNode.GREEN_FILE_ICON);
-        }
-
+        // Mark explodable files and SrcReplaceable files with a different icon (Green file icon)
+        if(value instanceof CollectionTreeNode) {
+        if(((CollectionTreeNode) value).isExplodable() || ((CollectionTreeNode) value).isSrcReplaceable()) {
+            tree_cell.setIcon(CollectionTreeNode.GREEN_FILE_ICON);
+        }
+        }
+            
         return tree_cell;
     }
@@ -125 +127 @@
     private JMenuItem expand_folder = null;
     private JMenuItem explode_metadata_database = null;
+    private JMenuItem replace_srcdoc_with_html = null;
     private JMenuItem delete = null;
     private JMenuItem metaaudit = null;
     private JMenuItem new_folder = null;
     private JMenuItem new_dummy_doc = null;
+    private JMenuItem refresh = null; // for refreshing folder view
     private JMenuItem open_externally = null;
     private JMenuItem rename = null;
@@ -202 +206 @@
     }
 
+    /** Checks whether the files selected are of the same filetype (have the same extension).
+     * @param selectedFilePaths - the full file paths to the treenodes selected in the 
+     * collection fileview. 
+     * @return true if the file extensions of all the selected files are the same. False is 
+     * returned if the file extension of any selected file is different (this means that if 
+     * a folder was selected, false would be returned). False is also returned if nothing was
+     * selected.
+     * For use with replace_srcdoc_with_html.pl
+    */
+    private boolean selectedFilesOfSameType(TreePath[] selectedFilePaths) {
+        if(selectedFilePaths == null || selectedFilePaths.length <= 0)
+        return false;
+
+        boolean sameExtension = true;
+
+        // get just the filename from the path and extract its extension
+        String firstFile = selectedFilePaths[0].getLastPathComponent().toString();
+        int period = firstFile.lastIndexOf('.');
+        if(period == -1) { // someone could have selected a folder
+        return false;
+        }
+        String extension = firstFile.substring(period); // includes period
+
+        // compare with the other selected files' extensions:
+        for(int i = 1; i < selectedFilePaths.length && sameExtension; i++) {
+        String otherFile = selectedFilePaths[i].getLastPathComponent().toString();
+        String otherFileExt = otherFile.substring(otherFile.lastIndexOf('.'));
+        if(!extension.equals(otherFileExt)) 
+            sameExtension = false;
+        }
+        return sameExtension;
+    }
 
     private void buildContextMenu(TreePath[] selection_paths)
@@ -215 +251 @@
         add(new_dummy_doc);
 
+        refresh = new JMenuItem(Dictionary.get("CollectionPopupMenu.Refresh"));
+        refresh.addActionListener(this);
+        add(refresh);
+
         node = (CollectionTreeNode) collection_tree.getModel().getRoot();
         return;
@@ -228 +268 @@
         add(delete);
 
-        // Only meta-audit and delete are available if multiple items are selected...
+        // The src doc replaceable (with html file) option is only available when all files selected are of the
+        // same type (same extension). For srcreplaceable files only. Works with replace_srcdoc_with_html.pl
+        CollectionTreeNode firstSelectedNode = (CollectionTreeNode)selection_paths[0].getLastPathComponent();
+        if(firstSelectedNode.isSrcReplaceable()) { // test the first selected node
+        replace_srcdoc_with_html = new JMenuItem(Dictionary.get("Menu.Replace_SrcDoc_With_HTML"), KeyEvent.VK_H);
+        replace_srcdoc_with_html.addActionListener(this);       
+        add(replace_srcdoc_with_html);
+        
+        // Now the menu is there, grey it out if not all the files are of the same type
+        if(!selectedFilesOfSameType(selection_paths)) {
+            replace_srcdoc_with_html.setEnabled(false);
+        } 
+        }
+       
+        // Only meta-audit and delete (and possibly replace_srcdoc) are available if multiple items are selected...
         if (selection_paths.length > 1) {
         return;
@@ -249 +303 @@
             add(explode_metadata_database);
         }
-
+    
         // Replace file
         // !! TO DO: Remote building
@@ -294 +348 @@
     /** Called whenever one of the menu items is clicked, this method then causes the appropriate effect. */
     public void actionPerformed(ActionEvent event)
-    {
-        Object source = event.getSource();
+    {   
+        Object source = event.getSource();
 
         // Collapse folder
@@ -310 +364 @@
         else if (source == explode_metadata_database) {
         Gatherer.f_man.explodeMetadataDatabase(node.getFile());
+        }
+        
+        // Replace source document with generated html (works with replace_srcdoc_with_html.pl)
+        else if (source == replace_srcdoc_with_html) {
+        java.io.File[] source_files = new java.io.File[selection_paths.length];
+        for (int i = 0; i < selection_paths.length; i++) {
+            CollectionTreeNode node = (CollectionTreeNode) selection_paths[i].getLastPathComponent(); 
+            source_files[i] = node.getFile();
+        }
+        Gatherer.f_man.replaceSrcDocWithHtml(source_files); // passing the selected files
         }
 
@@ -338 +402 @@
         }
 
+        // Refresh action to reload folder view
+        else if (source == refresh) { // Refresh collection tree
+        Gatherer.g_man.refreshCollectionTree(DragTree.COLLECTION_CONTENTS_CHANGED);
+        }
+
         // Open in external program
         else if (source == open_externally) {

gli/branches/rtl-gli/src/org/greenstone/gatherer/collection/CollectionTreeNode.java

@@ -33 +33 @@
 import org.greenstone.gatherer.file.FileNode;
 import org.greenstone.gatherer.util.JarTools;
+import java.util.Set;
+import java.util.Iterator;
+import java.nio.charset.Charset;
 
 
@@ -40 +43 @@
 {
     static final public ImageIcon GREEN_FILE_ICON = JarTools.getImage("greenfile.gif", true);
-
+    
     /** Is this file a metadata database that is explodable with the explode_metadata_databases.pl script? */
     private boolean is_explodable = false;
 
+    /** Keeps track of whether this file can be replaced with a Greenstone-generated html file.
+     * To work with replace_srcdoc_with_html.pl */
+    private boolean is_srcreplaceable = false;
 
     public CollectionTreeNode(File file)
@@ -50 +56 @@
 
     this.is_explodable = CollectionDesignManager.plugin_manager.isFileExplodable(file);
+    // To work with replace_srcdoc_with_html.pl
+    this.is_srcreplaceable = CollectionDesignManager.plugin_manager.isFileSrcReplaceable(file);
+    
     }
 
@@ -66 +75 @@
     return is_explodable;
     }
+
+    // To work with replace_srcdoc_with_html.pl
+    public boolean isSrcReplaceable()
+    {
+    return is_srcreplaceable;
+    }
 }

gli/branches/rtl-gli/src/org/greenstone/gatherer/collection/ScriptOptions.java

@@ -225 +225 @@
 
         if (Gatherer.isGsdlRemote) {
-        String script_output = RemoteGreenstoneServer.getScriptOptions(filename, "");
+        String script_output = Gatherer.remoteGreenstoneServer.getScriptOptions(filename, "");
         document = XMLTools.parseXML(new StringReader(script_output));
         }
@@ -247 +247 @@
         }
 
+
         // Create the process.
         Runtime runtime = Runtime.getRuntime();
         Process process = runtime.exec(args);
+
+        
+        for (int i=0; i<args.length; i++) { 
+            System.err.print(args[i] + " ");
+        }
+        System.err.println("");
+        
+
+
         document = XMLTools.parseXML(process.getErrorStream());
+        
+        if (document == null) {
+            // command has not generated XML, script has probably failed in some way
+            for (int i=0; i<args.length; i++) { 
+            DebugStream.print(args[i] + " ");
+            }
+            DebugStream.println("");
+        }
         }