Changeset 25541 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/DocumentMaker.java

Timestamp:

2012-05-08T09:55:48+12:00 (12 years ago)

Author:

sjm84

Message:

Removed some redundant code, as well as fixing up the createDocument transaction

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/DocumentMaker.java (modified) (5 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/DocumentMaker.java

@@ -383 +383 @@
             transactions = gson.fromJson(transactionString, type);
         }
-        catch(Exception ex)
+        catch (Exception ex)
         {
             ex.printStackTrace();
@@ -404 +404 @@
 
                     _GSDM.documentMoveOrDuplicate(origOID, origCollection, newOID, newCollection, _GSDM.operationStringToInt(subOperation), operation.equals("move"), userContext);
-
-                    if (_GSDM.getErrorStatus() == GSDocumentModel.NO_ERROR && origCollection != null && !collectionsToBuild.contains(origCollection))
-                    {
-                        collectionsToBuild.add(origCollection);
-                    }
-
-                    if (_GSDM.getErrorStatus() == GSDocumentModel.NO_ERROR && newCollection != null && !collectionsToBuild.contains(newCollection))
-                    {
-                        collectionsToBuild.add(newCollection);
-                    }
+                }
+                else if (operation.equals("createDocument"))
+                {
+                    String oid = (String) keyValueMap.get("oid");
+                    String collection = (String) keyValueMap.get("collection");
+
+                    _GSDM.documentCreate(oid, collection, userContext);
                 }
                 else if (operation.equals("create"))
@@ -423 +420 @@
                     //_GSDM.documentCreate(oid, collection, userContext); <--- Maybe go back to this
                     _GSDM.documentXMLSetSection(oid, collection, this.doc.createElement(GSXML.DOCXML_SECTION_ELEM), _GSDM.operationStringToInt(subOperation), userContext);
-
-                    if (_GSDM.getErrorStatus() == GSDocumentModel.NO_ERROR && collection != null && !collectionsToBuild.contains(collection))
-                    {
-                        collectionsToBuild.add(collection);
-                    }
                 }
                 else if (operation.equals("delete"))
@@ -435 +427 @@
 
                     _GSDM.documentDelete(oid, collection, userContext);
-
-                    if (_GSDM.getErrorStatus() == GSDocumentModel.NO_ERROR && collection != null && !collectionsToBuild.contains(collection))
-                    {
-                        collectionsToBuild.add(collection);
-                    }
                 }
                 else if (operation.equals("setText"))
@@ -446 +433 @@
                     String collection = (String) keyValueMap.get("collection");
                     String newContent = (String) keyValueMap.get("text");
-                    
+
                     _GSDM.documentXMLSetText(oid, collection, newContent, userContext);
                 }