/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 1555

Added by Jing Tao over 21 years ago

Fixed a bug which cause null exception.

        private Vector subTreeList = new Vector();// store the final subtree
        private int inLineDataIndex = 1;
        private Hashtable unChangableSubTreeHash = new Hashtable();
        private Stack currentUnChangedableSubtreeNodeStack;
        private Stack currentUnChangedableSubtreeNodeStack =new Stack();
        private boolean startCriticalSubTree = false;
        private boolean firstElementForCriticalSubTree = false;
        private String firstElementNameForCriticalSubTree;
        private boolean needCheckingAccessModule = false;
        private Vector unChangableAccessSubTreeVector;
        private Stack currentUnchangableAccessModuleNodeStack;
        private Vector unChangableAccessSubTreeVector = new Vector();
        private Stack currentUnchangableAccessModuleNodeStack = new Stack();
        private AccessSection topAccessSection;
        // we need an another stack to store the access node which we pull out just
        // from xml. If a reference happend, we can use the stack the compare nodes
        private Stack storedAccessNodeStack = new Stack();
        // vector stored the data file id which will be write into relation table
        private Vector onlineDataFileIdVector = new Vector();
        // Constant
-...
        private static final String ID ="id";
        private static final String REFERENCES = "references";
        public  static final String INLINE = "inline";
        private static final String ONLINE = "online";
        private static final String URL    = "url";
        private static final String PERMISSIONERROR ="User try to update a subtree"+
                                    " which it doesn't have write permission!";
        private static final String UPDATEACCESSERROR = "User try to update a " +
                           "access module which it doesn't have \"ALL\" permission!";
        private static final String TOPLEVEL = "top";
        private static final String SUBTREELEVEL ="subtree";
        private static final String RELATION = "Provides info for";
         /** Construct an instance of the handler class
         * In this constructor, user can specify the version need to upadate
-...
              accessObject.setReferences(data);
+           }
            else if (currentTag.equals(URL))
+           {
              //handle online data, make sure its'parent is online
              DBSAXNode parentNode = (DBSAXNode)nodeStack.peek();
              if (parentNode != null && parentNode.getTagName()!= null &&
                  parentNode.getTagName().equals(ONLINE))
+             {
                 // if online data is in local metacat, add it to the vector
                 data = (textBuffer.toString()).trim();
                 if (data != null &&
                     (data.indexOf(MetaCatUtil.getOption("httpserver")) != -1 ||
                     data.indexOf(MetaCatUtil.getOption("server")) != -1))
+                {
                   // Get docid from url
                   String dataId =MetaCatUtil.getDocIdWithRevFromOnlineURL(data);
                   // add to vector
                   onlineDataFileIdVector.add(dataId);
                 }//if
               }//if
            }//else if
            // write text to db if it is not inline data
            if (!localName.equals(INLINE))
+           {
-...
          else if (currentTag.equals(ACCESS))
+         {
            // finish parse a access setction and assign it to new one
            accessObject.setEndNodeId(endNodeId);
            AccessSection newAccessObject = accessObject;
            if (newAccessObject != null)
+           {
             // add the accessSection into a vector to store it
             // if it is not a reference, need to store it
             if ( newAccessObject.getReferences() == null)
+            {
               newAccessObject.setStoredTmpNodeStack(storedAccessNodeStack);
               accessObjectList.add(newAccessObject);
+            }
             if (processTopLeverAccess)
+            {
               // top level access control will handle whole document -docid
               topLevelAccessControlMap.put(docid, newAccessObject);
               // reset processtopleveraccess tag
-...
+            {
               // for additional control
               // put everything in describes value and access object into hash
               for ( int i=0; i<describesId.size(); i++)
+              {
-...
               additionalAccessControlMap = null;
               additionalAccessControlMap = new Hashtable();
             }//if
            }//if
            //check if  access node stack is empty after parsing top access
            //module
            if (!currentUnchangableAccessModuleNodeStack.isEmpty() &&
                processTopLeverAccess && needCheckingAccessModule)
            if (needCheckingAccessModule && processTopLeverAccess &&
                !currentUnchangableAccessModuleNodeStack.isEmpty())
+           {
              MetaCatUtil.debugMessage("Access node stack is not empty after " +
                                        "parsing access subtree", 40);
              throw new SAXException(UPDATEACCESSERROR);
+           }
            //reset access section object
            accessObject = null;
            // reset tmp stored node stack
            storedAccessNodeStack = null;
            storedAccessNodeStack = new Stack();
            // reset flag
            processAdditionalAccess =false;
            processTopLeverAccess =false;
-...
             describesId = null;
             describesId = new Vector();
+         }
+       }
        /**
-...
          // write access rule to db
          writeAccessRuleToDB();
          //delete relation table
          deleteRelations();
          //write relations
          for (int i= 0; i<onlineDataFileIdVector.size(); i++)
+         {
            String id = (String)onlineDataFileIdVector.elementAt(i);
            writeOnlineDataFileIdIntoRelationTable(id);
+         }
          // Starting new thread for writing XML Index.
          // It calls the run method of the thread.
-...
         MetaCatUtil.debugMessage("the inline data retrieve from file: "+data, 50);
         return data;
+      }
       /* Delete relations */
       private void deleteRelations() throws SAXException
+      {
         PreparedStatement pStmt = null;
         String sql = "DELETE FROM xml_relation where docid =?";
         try
+        {
           pStmt = connection.prepareStatement(sql);
           //bind variable
           pStmt.setString(1, docid);
           //execute query
           pStmt.execute();
           pStmt.close();
         }//try
         catch (SQLException e)
+        {
            throw new
            SAXException("EMLSAXHandler.deleteRelations(): " +
                           e.getMessage());
         }//catch
         finally
+        {
           try
+          {
             pStmt.close();
           }//try
           catch(SQLException ee)
+          {
             throw new
             SAXException("EMLSAXHandler.deleteRelations: " +
             ee.getMessage());
           }//catch
         }//finally
+      }
       /* Write an online data file id into xml_relation table*/
       private void writeOnlineDataFileIdIntoRelationTable(String dataId)
                                                             throws SAXException
+      {
         // Get rid of rev
         dataId = MetaCatUtil.getDocIdFromString(dataId);
         PreparedStatement pStmt = null;
         String sql = "INSERT into xml_relation (docid, packagetype, subject, "+
                      "relationship, object) values (?, ?, ?, ?, ?)";
         try
+        {
           pStmt = connection.prepareStatement(sql);
           //bind variable
           pStmt.setString(1, docid);
           pStmt.setString(2, DocumentImpl.EMLNAMESPACE);
           pStmt.setString(3, docid);
           pStmt.setString(4, RELATION);
           pStmt.setString(5, dataId);
           //execute query
           pStmt.execute();
           pStmt.close();
         }//try
         catch (SQLException e)
+        {
            throw new
            SAXException("EMLSAXHandler.writeOnlineDataFileIdIntoRelationTable(): " +
                           e.getMessage());
         }//catch
         finally
+        {
           try
+          {
             pStmt.close();
           }//try
           catch(SQLException ee)
+          {
             throw new
             SAXException("EMLSAXHandler.writeOnlineDataFileIdIntoRelationTable(): " +
             ee.getMessage());
           }//catch
         }//finally
       }//writeOnlineDataFileIdIntoRelationTable
+    }

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 1555

Added by Jing Tao over 21 years ago