[metacat-cvs] metacat/src/edu/ucsb/nceas/metacat IndexingTimerTask.java MetaCatServlet.java

[Saurabh Garg]

sgarg       05/11/17 13:27:21

  Modified:    src/edu/ucsb/nceas/metacat IndexingTimerTask.java
                        MetaCatServlet.java
  Log:
  Using xml_path_index instead of xml_index to find documents which havnt been indexed.
  
  Revision  Changes    Path
  1.4       +4 -5      metacat/src/edu/ucsb/nceas/metacat/IndexingTimerTask.java
  
  Index: IndexingTimerTask.java
  ===================================================================
  RCS file: /cvs/metacat/src/edu/ucsb/nceas/metacat/IndexingTimerTask.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- IndexingTimerTask.java	17 Nov 2005 20:37:47 -0000	1.3
  +++ IndexingTimerTask.java	17 Nov 2005 21:27:21 -0000	1.4
  @@ -7,8 +7,8 @@
    *    Release: @release@
    *
    *   '$Author: sgarg $'
  - *     '$Date: 2005/11/17 20:37:47 $'
  - * '$Revision: 1.3 $'
  + *     '$Date: 2005/11/17 21:27:21 $'
  + * '$Revision: 1.4 $'
    *
    * This program is free software; you can redistribute it and/or modify
    * it under the terms of the GNU General Public License as published by
  @@ -56,7 +56,7 @@
   	    	try{
   	    		logMetacat.warn("Running indexing timer task");
   	    		
  -	    		dbConn = DBConnectionPool.getDBConnection("IndexingThread.run");
  +	    		dbConn = DBConnectionPool.getDBConnection("IndexingThread");
   	    		serialNumber = dbConn.getCheckOutSerialNumber();
   	            Vector indexNamespaces = MetaCatUtil.getOptionList(MetaCatUtil.getOption("indexNamespaces"));
   	            String nonJoinCriteria = "b.docid is NULL";
  @@ -89,9 +89,8 @@
   	    		
   	    		String xmlDocumentsCheck = 
   	    			MetaCatUtil.dbAdapter.getLeftJoinQuery("a.docid, a.rev", "xml_documents", 
  -	    					"xml_index", "a.docid = b.docid", nonJoinCriteria);
  +	    					"xml_path_index", "a.docid = b.docid", nonJoinCriteria);
   
  -	    		logMetacat.warn(xmlDocumentsCheck);
   	    		PreparedStatement xmlDocCheck = dbConn.prepareStatement(xmlDocumentsCheck);
   	    		
   	    		// Increase usage count
  
  
  
  1.239     +4 -4      metacat/src/edu/ucsb/nceas/metacat/MetaCatServlet.java
  
  Index: MetaCatServlet.java
  ===================================================================
  RCS file: /cvs/metacat/src/edu/ucsb/nceas/metacat/MetaCatServlet.java,v
  retrieving revision 1.238
  retrieving revision 1.239
  diff -u -r1.238 -r1.239
  --- MetaCatServlet.java	17 Nov 2005 20:37:47 -0000	1.238
  +++ MetaCatServlet.java	17 Nov 2005 21:27:21 -0000	1.239
  @@ -7,8 +7,8 @@
    *    Release: @release@
    *
    *   '$Author: sgarg $'
  - *     '$Date: 2005/11/17 20:37:47 $'
  - * '$Revision: 1.238 $'
  + *     '$Date: 2005/11/17 21:27:21 $'
  + * '$Revision: 1.239 $'
    *
    * This program is free software; you can redistribute it and/or modify
    * it under the terms of the GNU General Public License as published by
  @@ -197,8 +197,8 @@
       {
           // Close all db connection
           System.out.println("Destroying MetacatServlet");
  -        DBConnectionPool.release();
           timer.cancel();
  +        DBConnectionPool.release();
       }
   
       /** Handle "GET" method requests from HTTP clients */