/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 697

Added by bojilova almost 24 years ago

- fixed missing replication of public_access
- new attribute catalog_id added in xml_documents and xml_revisions
as a FK to xml_catalog; catalog_id is replicated also

+           }
            rootNode.writeNodename(docname);
            try {
              // for validated XML Documents store a reference to XML DB Catalog
              String catalogid = null;
              if ( systemid != null ) {
                Statement stmt = conn.createStatement();
                ResultSet rs = stmt.executeQuery(
                               "SELECT catalog_id FROM xml_catalog " +
                               "WHERE entry_type = 'DTD' " +
                               "AND public_id = '" + doctype + "'");
                boolean hasRow = rs.next();
                if ( hasRow ) {
                 catalogid = rs.getString(1);
+               }
                stmt.close();
+             }
              currentDocument = new DocumentImpl(conn, rootNode.getNodeID(),
                                    docname, doctype, docid, action, user, this.pub,
                                    this.serverCode);
                                    docname, doctype, docid, action, user,
                                    this.pub, catalogid, this.serverCode);
            } catch (Exception ane) {
              throw (new SAXException("Error in DBSaxHandler.startElement " +
                                      action, ane));
+           }
            // not needed any more
            //rootNode.writeDocID(currentDocument.getDocID());
+         }
          // Create the current node representation
-...
          doctype = publicId;
          systemid = systemId;
     //System.out.println("Start DTD");
     //System.out.println("DOCNAME: " + docname);
     //System.out.println("DOCTYPE: " + doctype);
     //System.out.println("  SYSID: " + systemid);
          MetaCatUtil.debugMessage("Start DTD");
          MetaCatUtil.debugMessage("DOCNAME: " + docname);
          MetaCatUtil.debugMessage("DOCTYPE: " + doctype);
-...
         * SAX Handler that receives notification of end of DTD
         */
        public void endDTD() throws SAXException {
     //System.out.println("end DTD");
          MetaCatUtil.debugMessage("end DTD");
+       }
-...
         */
        public void startEntity(String name) throws SAXException {
          MetaCatUtil.debugMessage("start ENTITY: " + name);
     //System.out.println("start ENTITY: " + name);
          if (name.equals("[dtd]")) {
            processingDTD = true;
+         }
-...
         */
        public void endEntity(String name) throws SAXException {
          MetaCatUtil.debugMessage("end ENTITY: " + name);
     //System.out.println("end ENTITY: " + name);
          if (name.equals("[dtd]")) {
            processingDTD = false;
+         }
-...
         */
        public void elementDecl(String name, String model)
                             throws org.xml.sax.SAXException {
     //System.out.println("ELEMENTDECL: " + name + " " + model);
          MetaCatUtil.debugMessage("ELEMENTDECL: " + name + " " + model);
+       }
-...
        public void attributeDecl(String eName, String aName,
                             String type, String valueDefault, String value)
                             throws org.xml.sax.SAXException {
     //System.out.println("ATTRIBUTEDECL: " + eName + " "
     //                        + aName + " " + type + " " + valueDefault + " "
     //                        + value);
          MetaCatUtil.debugMessage("ATTRIBUTEDECL: " + eName + " "
                             + aName + " " + type + " " + valueDefault + " "
                             + value);
-...
         */
        public void internalEntityDecl(String name, String value)
                             throws org.xml.sax.SAXException {
     //System.out.println("INTERNENTITYDECL: " + name + " " + value);
          MetaCatUtil.debugMessage("INTERNENTITYDECL: " + name + " " + value);
+       }
-...
        public void externalEntityDecl(String name, String publicId,
                             String systemId)
                             throws org.xml.sax.SAXException {
     //System.out.println("EXTERNENTITYDECL: " + name + " " + publicId
     //                              + " " + systemId);
          MetaCatUtil.debugMessage("EXTERNENTITYDECL: " + name + " " + publicId
                                   + " " + systemId);
+       }

       private String userupdated = null;
       private int rev;
       private int serverlocation;
       private int publicaccess;
       private String publicaccess;
       private long rootnodeid;
       private ElementNode rootNode = null;
       private TreeSet nodeRecordList = null;
-...
        */
       public DocumentImpl(Connection conn, long rootnodeid, String docname,
                           String doctype, String docid, String action, String user,
                           String pub, int serverCode)
                           String pub, String catalogid, int serverCode)
                           throws SQLException, Exception
+      {
         this.conn = conn;
-...
         this.docname = docname;
         this.doctype = doctype;
         this.docid = docid;
         writeDocumentToDB(action, user, pub, serverCode);
         writeDocumentToDB(action, user, pub, catalogid, serverCode);
+      }
     // NOT USED ANY MORE
-...
         return serverlocation;
+      }
       public int getPublicaccess() {
       public String getPublicaccess() {
         return publicaccess;
+      }
-...
     // DOCTITLE attr cleared from the db
     //      sql.append("SELECT docname, doctype, rootnodeid, doctitle, ");
           sql.append("SELECT docname, doctype, rootnodeid, ");
           sql.append("date_created, date_updated, ");
           sql.append("user_owner, user_updated, server_location, ");
           sql.append("rev FROM ").append(table);
           sql.append("date_created, date_updated, user_owner, user_updated, ");
           sql.append("server_location, public_access, rev");
           sql.append(" FROM ").append(table);
           sql.append(" WHERE docid LIKE '").append(docid.getIdentifier());
           sql.append("' and rev like '").append(docid.getRev()).append("'");
           //System.out.println(sql.toString());
-...
             this.userowner      = rs.getString(6);
             this.userupdated    = rs.getString(7);
             this.serverlocation = rs.getInt(8);
             this.rev            = rs.getInt(9);
             this.publicaccess   = rs.getString(9);
             this.rev            = rs.getInt(10);
+          }
           if (this.doctype != null) {
-...
+        }
+      }
       /** creates SQL code and inserts new document into DB connection
        default serverCode of 1*/
       private void writeDocumentToDB(String action, String user)
                    throws SQLException, Exception
+      {
         writeDocumentToDB(action, user, null, 1);
+      }
     // NOT USED ANY MORE
     //  /** creates SQL code and inserts new document into DB connection
     //   default serverCode of 1*/
     //  private void writeDocumentToDB(String action, String user)
     //               throws SQLException, Exception
     //  {
     //    writeDocumentToDB(action, user, null, 1);
     //  }
      /** creates SQL code and inserts new document into DB connection */
       private void writeDocumentToDB(String action, String user, String pub,
                                      int serverCode)
                                      String catalogid, int serverCode)
                    throws SQLException, Exception {
         try {
           PreparedStatement pstmt = null;
-...
             //AccessionNumber ac = new AccessionNumber();
             //this.docid = ac.generate(docid, "INSERT");
             pstmt = conn.prepareStatement(
                 "INSERT INTO xml_documents " +
                 "(docid, rootnodeid, docname, doctype, user_owner, user_updated, " +
                 "date_created, date_updated, public_access, server_location) " +
                 "VALUES (?, ?, ?, ?, ?, ?, sysdate, sysdate, ?, ?)");
                     "INSERT INTO xml_documents " +
                     "(docid, rootnodeid, docname, doctype, " +
                     "user_owner, user_updated, date_created, date_updated, " +
                     "public_access, catalog_id, server_location) " +
                     "VALUES (?, ?, ?, ?, ?, ?, sysdate, sysdate, ?, ?, ?)");
             //note that the server_location is set to 1.
             //this means that "localhost" in the xml_replication table must
             //always be the first entry!!!!!
-...
             pstmt.setString(6, user);
             if ( pub == null ) {
               pstmt.setString(7, null);
             } else if ( pub.toUpperCase().equals("YES") ) {
             } else if ( pub.toUpperCase().equals("YES") || pub.equals("1") ) {
               pstmt.setInt(7, 1);
             } else if ( pub.toUpperCase().equals("NO") ) {
             } else if ( pub.toUpperCase().equals("NO") || pub.equals("0") ) {
               pstmt.setInt(7, 0);
+            }
             pstmt.setInt(8, serverCode);
             pstmt.setString(8, catalogid);
             pstmt.setInt(9, serverCode);
           } else if (action.equals("UPDATE")) {
             // Save the old document entry in a backup table
-...
                 "UPDATE xml_documents " +
                 "SET rootnodeid = ?, docname = ?, doctype = ?, " +
                 "user_updated = ?, date_updated = sysdate, " +
                 "server_location = ?, rev = ?, public_access = ? " +
                 "server_location = ?, rev = ?, public_access = ?, catalog_id = ? " +
                 "WHERE docid LIKE ?");
             // Bind the values to the query
             pstmt.setLong(1, rootnodeid);
-...
             pstmt.setInt(6, thisrev);
             if ( pub == null ) {
               pstmt.setString(7, null);
             } else if ( pub.toUpperCase().equals("YES") ) {
             } else if ( pub.toUpperCase().equals("YES") || pub.equals("1") ) {
               pstmt .setInt(7, 1);
             } else if ( pub.toUpperCase().equals("NO") ) {
             } else if ( pub.toUpperCase().equals("NO") || pub.equals("0") ) {
               pstmt.setInt(7, 0);
+            }
             pstmt.setString(8, this.docid);
             pstmt.setString(8, catalogid);
             pstmt.setString(9, this.docid);
           } else {
             System.err.println("Action not supported: " + action);
-...
         PreparedStatement pstmt = conn.prepareStatement(
           "INSERT INTO xml_revisions " +
             "(revisionid, docid, rootnodeid, docname, doctype, " +
             "user_owner, user_updated, date_created, date_updated, server_location, " +
             "rev)" +
             "user_owner, user_updated, date_created, date_updated, " +
             "server_location, rev, public_access, catalog_id) " +
           "SELECT null, ?, rootnodeid, docname, doctype, " +
             "user_owner, ?, sysdate, sysdate, server_location, rev "+
             "user_owner, ?, sysdate, sysdate, server_location, rev, " +
             "public_access, catalog_id " +
           "FROM xml_documents " +
           "WHERE docid = ?");
         // Bind the values to the query and execute it

+            }
+          }
           serverList = buildServerList(conn);
           updateCatalog(serverList);
           update(serverList);
           updateCatalog(serverList);
           conn.close();
+        }
         catch (Exception e)
-...
+                {
                   String newDocid = DocumentImpl.write(conn,
                                   new StringReader(newxmldoc),
                                   null,
                                   (String)docinfoHash.get("public_access"),
                                   null,  /* the dtd text */
                                   action,
                                   docid,
                                   (String)docinfoHash.get("user_owner"),
                                   (String)docinfoHash.get("user_owner"),
                                   serverCode,
                                   true);
                                   true, /* override */
                                   false /* validate */);
                   MetacatReplication.replLog("wrote doc " + docid + " from " +
                                              docServer);
                   System.out.println("wrote doc " + docid + " from " +

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 697

Added by bojilova almost 24 years ago