Changeset 28995

Timestamp:

2014-04-24T21:34:33+12:00 (10 years ago)

Author:

ak19

Message:

First commit for GLI part of GS2 to GS3 Format Conversion. Contains all the changes needed for the FormatConversionDialog to work, and some cosmetic changes to cdm.Format4gs3Manager.java. Still need to implement undo and redo and think about what needs to happen and how for Remote GS3.

Location:

main/trunk/gli/src/org/greenstone/gatherer

Files:

• Configuration.java (modified) (1 diff)
• cdm/Format4gs3Manager.java (modified) (3 diffs)
• gui/FormatConversionDialog.java (added)
• gui/OpenCollectionDialog.java (modified) (3 diffs)
• util/Codec.java (modified) (2 diffs)
• util/XMLTools.java (modified) (4 diffs)

main/trunk/gli/src/org/greenstone/gatherer/Configuration.java

@@ -697 +697 @@
     }
 
+    static public String getGS3BinPath() {
+    return gsdl3_src_path + "bin" + File.separator;
+    }
+
     /** Remove a previously defined special directory mapping.
      * @param name The name of the mapping to remove as a <strong>String</strong>.

main/trunk/gli/src/org/greenstone/gatherer/cdm/Format4gs3Manager.java

@@ -389 +389 @@
     }
 
-    private String removeSurrondingTags(String xml)
+    private String removeSurroundingTags(String xml)
     {
       return xml.replace("<ROOTELEMENT>\n", "").replace("<ROOTELEMENT>", "").replace("</ROOTELEMENT>", "").replace("<ROOTELEMENT/>","");
@@ -732 +732 @@
                         StringBuffer sb = new StringBuffer();
                         XMLTools.xmlNodeToString(sb, formatElem, true, "  ", 0);
-                        editor_textarea.setText(removeSurrondingTags(sb.toString()));
+                        editor_textarea.setText(removeSurroundingTags(sb.toString()));
                     }
                     else
@@ -817 +817 @@
                             StringBuffer sb = new StringBuffer();
                             XMLTools.xmlNodeToString(sb, formatElem, true, "  ", 0);
-                            editor_textarea.setText(removeSurrondingTags(sb.toString()));
+                            editor_textarea.setText(removeSurroundingTags(sb.toString()));
                         }
                         else

main/trunk/gli/src/org/greenstone/gatherer/gui/OpenCollectionDialog.java

@@ -43 +43 @@
 import org.greenstone.gatherer.shell.GShellListener;
 import org.greenstone.gatherer.shell.GShellProgressMonitor;
+
 
 /** A dialog which provides a straight-forward access to the currently installed collections. It also will contain the ability to continue through to the original OpenCollectionDialog if your source collection is located somewhere other than the gsdl collect folder. */
@@ -399 +400 @@
         process.run(); // Don't bother threading this... yet
         
-        collect_cfg_file.delete();
-        build_cfg_file.delete();
+        // From now, won't dangerously delete GS2 collect and build config files anymore
+        //collect_cfg_file.delete();
+        //build_cfg_file.delete();
+
+        File collect_bak_file = new File(collection_folder.getAbsolutePath() + File.separator + "etc" + File.separator + "collect.cfg.bak");
+        File build_bak_file = new File(collection_folder.getAbsolutePath() + File.separator+"index" + File.separator + "build.cfg.bak");
+        if(!collect_cfg_file.renameTo(collect_bak_file)) {
+            System.err.println("Unable to move collect.cfg to " + collect_bak_file);
+        }
+        if(!build_cfg_file.renameTo(build_bak_file)) {
+            System.err.println("Unable to move build.cfg to " + build_bak_file);
+        }
         }
     }
@@ -415 +426 @@
         //****************
         File collect_cfg_file = collection_configuration.getFile(); // returns the collect.cfg file
-        File etc_folder = collect_cfg_file.getParentFile();
-        File collection_folder = etc_folder.getParentFile();
-        filename = collection_folder.getAbsolutePath() + File.separator + "gli.col";
-        collection_folder = null;
-        etc_folder = null;
-        collect_cfg_file = null;
-        collection_configuration = null;
+        result = FormatConversionDialog.checkForGS2FormatStatements(collect_cfg_file);
+        if(result == OK_OPTION) { // either there were no gs2 format stmts or user chose to proceed
+            File etc_folder = collect_cfg_file.getParentFile();
+            File collection_folder = etc_folder.getParentFile();
+            filename = collection_folder.getAbsolutePath() + File.separator + "gli.col";
+            collection_folder = null;
+            etc_folder = null;
+            collect_cfg_file = null;
+            collection_configuration = null;
+        }
         OpenCollectionDialog.this.dispose();
         }
 
-        Gatherer.collectDirectoryHasChanged(Gatherer.getCollectDirectoryPath(), 
+        if(result == OK_OPTION) {
+        Gatherer.collectDirectoryHasChanged(Gatherer.getCollectDirectoryPath(), 
                 newCollectPath, Gatherer.g_man.getContentPane()); 
             // will tell the server that the collect directory has changed and that
             // the workspace needs to be refreshed (Documents in Greenstone Collections)
+        }
     }
     }

main/trunk/gli/src/org/greenstone/gatherer/util/Codec.java

@@ -41 +41 @@
     static final public String ENCODE_PATH = "ENCODE_PATH";
     static final public String ENCODE_SQUARE_BRACKETS = "ENCODE_SQUARE_BRACKETS";
+    static final public String ESCAPEDHTML_TO_UNESCAPED = "ESCAPEDHTML_TO_UNESCAPED";
     static final public String GREENSTONE_TO_DOM = "GREENSTONE_TO_DOM";
     static final public String GREENSTONE_TO_TEXT = "GREENSTONE_TO_TEXT";
@@ -168 +169 @@
     TRANSFORMS.put(TEXT_TO_DOM, text_to_dom);
     text_to_dom = null;
+
+    // Unescape html (or xml) text
+    String[] escapedhtml_to_unescaped = {
+        "&", "&",
+        "&lt;", "<", 
+        "&gt;", ">",
+        "&quot;", "\""//,
+        //"&apos;", "\'"
+    };
+    TRANSFORMS.put(ESCAPEDHTML_TO_UNESCAPED, escapedhtml_to_unescaped);
+    escapedhtml_to_unescaped = null;
 
     // Transform plain html text into greenstone encoding

main/trunk/gli/src/org/greenstone/gatherer/util/XMLTools.java

@@ -22 +22 @@
 
 // JAXP
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.FactoryConfigurationError;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
+
 
 /** This class is a static class containing useful XML functions */
@@ -331 +334 @@
     static final private String HEADER = "<?xml version='1.0' encoding='UTF-8'?><collectionConfig xmlns:gsf='http://www.greenstone.org/greenstone3/schema/ConfigFormat' xmlns:xsl='http://www.w3.org/1999/XSL/Transform'>";
     static final private String FOOTER = "</collectionConfig>";
+
+
+    public static Document getDOM(String xml_str) 
+    {   
+    Document doc = null;
+    try {
+        /*SAXParserFactory factory = SAXParserFactory.newInstance();
+        factory.setNamespaceAware(true);
+        //factory.setValidating (true);
+        SAXParser parser = factory.newSAXParser();
+        InputSource iSource = new InputSource(new StringReader(xml_str));
+        //              parser.parse (iSource, new DefaultHandler ());
+        
+        org.xml.sax.XMLReader reader = parser.getXMLReader();
+        reader.setContentHandler(new DefaultHandler());
+        reader.setErrorHandler(new DefaultHandler());
+        doc = reader.parse(iSource);
+        */
+
+        DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+        InputSource is = new InputSource();
+        is.setCharacterStream(new StringReader(xml_str));
+        doc = db.parse(is);
+
+    } catch (Exception e) {
+        e.printStackTrace();
+    }
+    return doc; 
+    }
 
     public static String parse(String xml_str)
@@ -991 +1023 @@
     public static void xmlNodeToString(StringBuffer sb, Node e, boolean indent, String indentString, int depth)
     {
-        if (e.getNodeType() == Node.TEXT_NODE)
+
+        if (e.getNodeType() == Node.CDATA_SECTION_NODE)
+        {
+            if (e.getNodeValue() != "")
+            {
+                String text = e.getNodeValue();             
+                sb.append("<![CDATA[");
+                sb.append(text);
+                sb.append("]]>");
+            }
+            return;
+        }
+
+        if (e.getNodeType() == Node.TEXT_NODE)
         {
             if (e.getNodeValue() != "")
@@ -1057 +1102 @@
                 hasElements = true;
             }
-            if (children.item(i).getNodeType() == Node.TEXT_NODE && indent)
+            if ((children.item(i).getNodeType() == Node.TEXT_NODE || children.item(i).getNodeType() == Node.CDATA_SECTION_NODE) && indent)
             {
                 if (children.item(i).getNodeValue().trim().length() > 0)