Changeset 25542

Timestamp:

2012-05-08T15:04:31+12:00 (12 years ago)

Author:

sjm84

Message:

Adding a dc.Title of "UNTITLED DOCUMENT" to new documents

File:

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

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

@@ -130 +130 @@
             return;
         }
-
-        //If the document does not have an OID specified then generate one
+        
+        //If the collection is not specified then we cannot continue
         if (oid == null || oid.equals(""))
         {
-            oid = generateOID();
-        }
-        else if (archiveCheckDocumentOrSectionExists(oid, collection, userContext))
+            _errorStatus = ERROR_OID_NOT_SPECIFIED;
+            return;
+        }
+
+        if (archiveCheckDocumentOrSectionExists(oid, collection, userContext))
         {
             _errorStatus = ERROR_DESTINATION_DOCUMENT_OR_SECTION_ALREADY_EXISTS;
@@ -673 +675 @@
         try
         {
-            Document docXML = null;
-
-            String filePath = archiveGetDocumentFilePath(oid, collection, userContext);
-            File docFile = new File(filePath);
-            if (!docFile.exists() && !docFile.createNewFile())
+            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())
+                {
+                    _errorStatus = ERROR_DOC_XML_COULD_NOT_BE_CREATED;
+                    return;
+                }
+            }
+            
+            File docFile = new File(docFolderPath + s + "doc.xml");
+            if(!docFile.exists() && !docFile.createNewFile())
             {
                 _errorStatus = ERROR_DOC_XML_COULD_NOT_BE_CREATED;
@@ -687 +700 @@
             bw.write("<!DOCTYPE Archive SYSTEM \"http://greenstone.org/dtd/Archive/1.0/Archive.dtd\">\n");
             bw.write("<Archive>\n");
+            bw.write("  <Section>\n");
+            bw.write("    <Description>\n");
+            bw.write("      <Metadata name=\"Identifier\">" + oid + "</Metadata>\n");
+            bw.write("      <Metadata name=\"dc.Title\">UNTITLED DOCUMENT</Metadata>\n");
+            bw.write("    </Description>\n");
+            bw.write("    <Content>\n");
+            bw.write("    </Content>\n");
+            bw.write("  </Section>\n");
             bw.write("</Archive>\n");
             bw.close();
 
+            Document docXML = null;
             DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
             DocumentBuilder db = dbf.newDocumentBuilder();
@@ -1831 +1853 @@
     }
 
-    protected static String generateOID()
-    {
-        return "temp";
-    }
-
     public boolean copyDirectory(File src, File dest)
     {