/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 660

Added by bojilova over 23 years ago

- turned on the validation in order only valid xml docs comformed to the specified dtd (if any) to be submitted in metacat
- with validation "on" white spaces are reported from ignorableWhitespace() callback, not from characters() (as with validation "off")
Thus included insert of whitespaces from ignorableWhitespace()
- excluded insertion of the comments coming from the dtd file.
There are feature "external-parameter_entities" that when turned to "off"
supposed to exclude the insertion of all external paramer entities (the external DTD also)
but it doesn't work probably b' the name of the feature is not correct

+       }
        /**
         * SAX Handler that is called for each XML text node that is Ignorable
         * white space
         * SAX Handler that is called for each XML text node that is
         * Ignorable white space
         */
        public void ignorableWhitespace(char[] cbuf, int start, int len) {
        public void ignorableWhitespace(char[] cbuf, int start, int len)
                    throws SAXException {
          // When validation is turned "on", white spaces are reported here
          // When validation is turned "off" white spaces are not reported here,
          // but through characters() callback
          MetaCatUtil.debugMessage("IGNORABLEWHITESPACE");
          //System.out.println("Whitespace:" + len + "x" + new String(cbuf, start, len) + "x");
          DBSAXNode currentNode = (DBSAXNode)nodeStack.peek();
          String data = null;
          int leftover = len;
          int offset = start;
          boolean moredata = true;
          // This loop deals with the case where there are more characters
          // than can fit in a single database text field (limit is
          // MAXDATACHARS).  If the text to be inserted exceeds MAXDATACHARS,
          // write a series of nodes that are MAXDATACHARS long, and then the
          // final node contains the remainder
          while (moredata) {
            if (leftover > MAXDATACHARS) {
              data = new String(cbuf, offset, MAXDATACHARS);
              leftover -= MAXDATACHARS;
              offset += MAXDATACHARS;
            } else {
              data = new String(cbuf, offset, leftover);
              moredata = false;
+           }
            // Write the content of the node to the database
            currentNode.writeChildNodeToDB("TEXT", null, data, docid);
+         }
+       }
        /**
-...
         */
        public void comment(char[] ch, int start, int length) throws SAXException {
          MetaCatUtil.debugMessage("COMMENT");
          DBSAXNode currentNode = (DBSAXNode)nodeStack.peek();
          currentNode.writeChildNodeToDB("COMMENT", null, new String(ch), docid);
          if ( !processingDTD ) {
            DBSAXNode currentNode = (DBSAXNode)nodeStack.peek();
            currentNode.writeChildNodeToDB("COMMENT", null, new String(ch), docid);
+         }
+       }
        /**
-...
         */
        public void error(SAXParseException exception) throws SAXException {
          MetaCatUtil.debugMessage("ERROR");
          throw (new SAXException("Processing error.", exception));
+       }
        /**
-...
         */
        public void warning(SAXParseException exception) throws SAXException {
          MetaCatUtil.debugMessage("WARNING");
          throw (new SAXException("Warning.", exception));
+       }
        //

           String parserName = util.getOption("saxparser");
           parser = XMLReaderFactory.createXMLReader(parserName);
           // Turn off validation
           parser.setFeature("http://xml.org/sax/features/validation", false);
           // Turn on validation
           parser.setFeature("http://xml.org/sax/features/validation", true);
           // Turn off Including all external parameter entities
           // (the external DTD subset also)
           // Doesn't work well, probably the feature name is not correct
           // parser.setFeature(
           //  "http://xml.org/sax/features/external-parameter-entities", false);
           // Set Handlers in the parser
           parser.setProperty("http://xml.org/sax/properties/declaration-handler",

       private String resourceURL;
       private String resourceId;
       private Vector principalName;
       private Vector principal;
       private int    permission;
       private String permType;
       private String permOrder;
-...
         this.user = user;
         this.group = group;
         this.aclid = aclid;
         this.principalName = new Vector();
         this.principal = new Vector();
         this.permission = 0;
         this.ticketCount = 0;
-...
              user, group);
+      }
       /**
        * Set up the SAX parser for reading the XML serialized ACL
        */
       /* Set up the SAX parser for reading the XML serialized ACL */
       private XMLReader initializeParser() throws SAXException
+      {
         XMLReader parser = null;
-...
+          }
           // end of check for "all" perm on resourceId
         } else if (currentTag.equals("principalName")) {
         } else if (currentTag.equals("principal")) {
           principalName.addElement(new String(inputString));
           principal.addElement(new String(inputString));
         } else if (currentTag.equals("permission")) {
-...
+          }
           // reset the allowed permission
           principalName = new Vector();
           principal = new Vector();
           permission = 0;
           beginTime = null;
           endTime = null;
-...
+          }
           // reset the denied permission
           principalName = new Vector();
           principal = new Vector();
           permission = 0;
           beginTime = null;
           endTime = null;
-...
           } else {
             pstmt.setString(8, "");
+          }
           for ( int i = 0; i < principalName.size(); i++ ) {
             pstmt.setString(2, (String)principalName.elementAt(i));
           for ( int i = 0; i < principal.size(); i++ ) {
             pstmt.setString(2, (String)principal.elementAt(i));
             pstmt.execute();
+          }

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 660

Added by bojilova over 23 years ago