/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 483

allowed both indexing threads to run without interfering with each other.

       // The run method of xmlIndex thread. It writes XML Index for the document.
       public void run () {
         System.out.println("Jivka's thread is starting");
         DBSAXNode currNode = null;
         DBSAXNode prevNode = null;
         int step = 0;
-...
+          }
           conn.commit();
           System.out.println("Jivka's thread is done executing");
           //if this is a package file then write the package info to
           //the xml_relation table. relationHandler checks to see
           //if it is a package file so you don't have to do it here.
           DocumentImpl xmldoc = new DocumentImpl(conn, docid);
           System.out.println("starting chad's thread");
           relationHandler rth = new relationHandler(xmldoc, conn);
           util.returnConnection(conn);
           conn.close();
           //util.closeConnections();
         } catch (Exception e) {
           try {
             conn.rollback();
-...
              currentDocument.setTitle(new String(cbuf, start, MAXTITLELEN));
            else
              currentDocument.setTitle(new String(cbuf, start, leftover));
+         }
+         }
+       }
        /**

src/edu/ucsb/nceas/metacat/relationHandler.java
31	31	* relations.
32	32	* @param xmldoc the xml document to index.
33	33	*/
34		public relationHandler(DocumentImpl xmldoc)
	34	public relationHandler(DocumentImpl xmldoc, Connection con)
35	35	{
36	36	try
37	37	{
38		conn = util.getConnection();
	38	//conn = util.getConnection();
	39	if(conn == null)
	40	{
	41	conn = util.getConnection();
	42	}
	43	else
	44	{
	45	this.conn = con;
	46	}
39	47	}
40	48	catch(Exception e)
41	49	{
42		System.out.println("error getting db connection in relationhandler");
	50	System.out.println("error getting db connection in relationhandler:");
	51	System.out.println(e.getMessage());
43	52	}
44	53
45	54	this.xmldoc = xmldoc;
...	...
163	172	hasmorerows = rs.next();
164	173	}
165	174
	175	conn.commit();
166	176	util.returnConnection(conn);
167	177	btThread = null;
168	178	}
...	...
170	180	{
171	181	System.out.println("Error in relationHandler: " + e.getMessage());
172	182	util.debugMessage("Error in relationHandler: " + e.getMessage());
	183	e.printStackTrace(System.out);
173	184	btThread = null;
174	185	}
175	186	}

+                    }
                     newdocid = DocumentImpl.write(conn, xml, doAction, accNumber,
                                                   user, group);
                     DocumentImpl xmldoc = new DocumentImpl(conn, newdocid);
                    //if this is a package file then write the package info to
                    //the xml_relation table. relationHandler checks to see
                    //if it is a package file so you don't have to do it here.
                    relationHandler rth = new relationHandler(xmldoc);
                    //DocumentImpl xmldoc = new DocumentImpl(conn, newdocid);
                    //relationHandler rth = new relationHandler(xmldoc, conn);
                 } catch (NullPointerException npe) {
                   newdocid = DocumentImpl.write(conn,xml,doAction,null,user,group);

Also available in: Unified diff