Changeset 25551 for main/trunk

Timestamp:

2012-05-09T13:53:19+12:00 (12 years ago)

Author:

sjm84

Message:

Removed some redundant code

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSDocumentModel.java (modified) (8 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSDocumentModel.java

@@ -130 +130 @@
             return;
         }
-        
+
         //If the collection is not specified then we cannot continue
         if (oid == null || oid.equals(""))
@@ -153 +153 @@
         if (!section)
         {
-            File newDir = new File(_siteHome + File.separatorChar + "collect" + File.separatorChar + collection + File.separatorChar + "archives" + File.separatorChar + oid);
-
-            if (!newDir.exists())
-            {
-                newDir.mkdir();
-            }
-
-            HashMap<String, ArrayList<String>> entries = new HashMap<String, ArrayList<String>>();
-            ArrayList<String> values = new ArrayList<String>();
-            values.add(oid + "/doc.xml");
-            entries.put("doc-file", values);
-
-            //Write the new entry to the archive database 
-            archiveWriteEntryToDatabase(oid, collection, entries, userContext);
-            if (_errorStatus != NO_ERROR)
-            {
-                return;
-            }
-
             //Create a basic doc.xml file to go in the new folder
             documentXMLCreateDocXML(oid, collection, userContext);
@@ -398 +379 @@
                 return;
             }
-            
+
             if (move)
             {
@@ -676 +657 @@
         {
             String s = File.separator;
-            
+
             String docFolderPath = _siteHome + s + "collect" + s + collection + s + "import" + s + oid;
             File docFolder = new File(docFolderPath);
-            
+
             if (!docFolder.exists())
             {
-                if(!docFolder.mkdirs())
+                if (!docFolder.mkdirs())
                 {
                     _errorStatus = ERROR_DOC_XML_COULD_NOT_BE_CREATED;
@@ -688 +669 @@
                 }
             }
-            
+
             File docFile = new File(docFolderPath + s + "doc.xml");
-            if(!docFile.exists() && !docFile.createNewFile())
+            if (!docFile.exists() && !docFile.createNewFile())
             {
                 _errorStatus = ERROR_DOC_XML_COULD_NOT_BE_CREATED;
@@ -1262 +1243 @@
             }
         }
-        
+
         //Write the new change back into the file
         if (!writeXMLFile(docXML, oid, collection, userContext))
@@ -1623 +1604 @@
             return;
         }
+
         coll_db.setInfo(oid, info);
         coll_db.closeDatabase();
@@ -2079 +2061 @@
         }
     }
-    
+
     public int getErrorStatus()
     {