/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 695

Added by bojilova almost 24 years ago

Included check up for <!DOCTYPE ... PUBLIC/SYSTEM ... >
in order to set the validation parser at runtime
In case of:
- no DOCTYPE declaration
- <!DOCTYPE docname>
validation is turned "off"
In case of:
- <!DOCTYPE ... PUBLIC ...>
- <!DOCTYPE ... SYSTEM ...>
validation is turned "on"

+          }
           StringReader xml = null;
           boolean validate = false;
           try {
             // look inside XML Document for <!DOCTYPE ... PUBLIC/SYSTEM ... >
             // in order to decide whether to use validation parser
             validate = validateXML(doctext[0]);
             xml = new StringReader(doctext[0]);
             String[] action = (String[])params.get("action");
-...
                   accNumber = null;
+                }
                 newdocid = DocumentImpl.write(conn, xml, pub, dtd, doAction,
                                               accNumber, user, group);
                                               accNumber, user, group, validate);
               } catch (NullPointerException npe) {
                 newdocid = DocumentImpl.write(conn, xml, pub, dtd, doAction,
                                               null, user, group);
                                               null, user, group, validate);
+              }
             } finally {
               util.returnConnection(conn);
-...
+      }
       /**
        * Parse XML Document to look for <!DOCTYPE ... PUBLIC/SYSTEM ... >
        * in order to decide whether to use validation parser
        */
       private static boolean validateXML(String xmltext) throws IOException {
         StringReader xmlreader = new StringReader(xmltext);
         StringBuffer cbuff = new StringBuffer();
         java.util.Stack st = new java.util.Stack();
         boolean validate = false;
         int c;
         int inx;
         // read from the stream until find the keywords
         while ( (st.empty() || st.size()<4) && ((c = xmlreader.read()) != -1) ) {
           cbuff.append((char)c);
           // "<!DOCTYPE" keyword is found; put it in the stack
           if ( (inx = cbuff.toString().indexOf("<!DOCTYPE")) != -1 ) {
             cbuff = new StringBuffer();
             st.push("<!DOCTYPE");
+          }
           // "PUBLIC" keyword is found; put it in the stack
           if ( (inx = cbuff.toString().indexOf("PUBLIC")) != -1 ) {
             cbuff = new StringBuffer();
             st.push("PUBLIC");
+          }
           // "SYSTEM" keyword is found; put it in the stack
           if ( (inx = cbuff.toString().indexOf("SYSTEM")) != -1 ) {
             cbuff = new StringBuffer();
             st.push("SYSTEM");
+          }
           // ">" character is found; put it in the stack
           // ">" is found twice: fisrt from <?xml ...?>
           // and second from <!DOCTYPE ... >
           if ( (inx = cbuff.toString().indexOf(">")) != -1 ) {
             cbuff = new StringBuffer();
             st.push(">");
+          }
+        }
         // close the stream
         xmlreader.close();
         // check the stack whether it contains the keywords:
         // "<!DOCTYPE", "PUBLIC" or "SYSTEM", and ">" in this order
         if ( st.size() == 4 ) {
           if ( ((String)st.pop()).equals(">") &&
                ( ((String)st.peek()).equals("PUBLIC") |
                  ((String)st.pop()).equals("SYSTEM") ) &&
                ((String)st.pop()).equals("<!DOCTYPE") )  {
             validate = true;
+          }
+        }
     System.out.println("Validation is " + validate);
         return validate;
+      }
       /**
        * Handle the database delete request and delete an XML document
        * from the database connection
        */

           dtd = new FileReader(new File(dtdfilename).toString());
+        }
         return write ( conn, new FileReader(new File(filename).toString()),
                        pub, dtd, action, docid, user, group);
                        pub, dtd, action, docid, user, group, false);
+      }
       public static String write(Connection conn,Reader xml,String pub,Reader dtd,
                                  String action, String docid, String user,
                                  String group )
                                  String group, boolean validate)
                     throws Exception {
         return write ( conn, xml, pub, dtd, action, docid, user, group, 1, false);
         return write(conn,xml,pub,dtd,action,docid,user,group,1,false,validate);
+      }
       public static String write(Connection conn, Reader xml, String pub,
-...
                                   String group, int serverCode)
                     throws Exception
+      {
         return write(conn,xml,pub,null,action,docid,user,group,serverCode,false);
         return write(conn,xml,pub,null,action,docid,user,group,
                      serverCode,false,false);
+      }
       public static String write( Connection conn, Reader xml, String pub,
-...
                                   String group, int serverCode, boolean override)
                     throws Exception
+      {
         return write(conn,xml,pub,null,action,docid,user,group,serverCode,override);
         return write(conn,xml,pub,null,action,docid,user,group,
                      serverCode,override,false);
+      }
       /**
-...
       public static String write( Connection conn,Reader xml,String pub,Reader dtd,
                                   String action, String docid, String user,
                                   String group, int serverCode, boolean override)
                                   String group, int serverCode, boolean override,
                                   boolean validate)
                     throws Exception
+      {
         //MOVED DOWN IN RelationHandler obj before write of relations
-...
+            {
               MetacatReplication.replLog("lock granted for " + docid + " from " +
                                           server);
               XMLReader parser = initializeParser(conn, action, newdocid,
               XMLReader parser = initializeParser(conn, action, newdocid, validate,
                                                   user, group, pub, serverCode, dtd);
               conn.setAutoCommit(false);
               parser.parse(new InputSource(xml));
               parser.parse(new InputSource(xml));
               conn.commit();
               conn.setAutoCommit(true);
+            }
-...
         try
+        {
           XMLReader parser = initializeParser(conn, action, newdocid,
           XMLReader parser = initializeParser(conn, action, newdocid, validate,
                                               user, group, pub, serverCode, dtd);
           conn.setAutoCommit(false);
           parser.parse(new InputSource(xml));
-...
        * Set up the parser handlers for writing the document to the database
        */
       private static XMLReader initializeParser(Connection conn, String action,
                                        String docid, String user, String group,
                                        String pub, int serverCode, Reader dtd)
                                        String docid, boolean validate,
                                        String user, String group, String pub,
                                        int serverCode, Reader dtd)
                                throws Exception
+      {
         XMLReader parser = null;
-...
           parser = XMLReaderFactory.createXMLReader(parserName);
           // Turn on validation
           parser.setFeature("http://xml.org/sax/features/validation", true);
           parser.setFeature("http://xml.org/sax/features/validation", validate);
           // Turn off Including all external parameter entities
           // (the external DTD subset also)
           // Doesn't work well, probably the feature name is not correct

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 695

Added by bojilova almost 24 years ago