/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 6416

Added by rnahf over 12 years ago

fixed logic wrt localID and docid. Implemented new method in IdentifierManager to getAllGUIDs from identifier table for implementation of loadAllKeys in ObjectPathMapLoader.

     	 * the data.  The doctype value for metadata can vary, but for data
     	 * is always 'BIN', so using a simple if-then-else to separate
     	 */
     	private String pathToDocid(String docid) throws SQLException {
     	private String pathToDocid(String localid) throws McdbDocNotFoundException  {
     		String revType = dbUtil.getCurrentRevisionAndDocTypeForGivenDocument(docid);
     		String[] rt = revType.split(";");
     		String docType = rt[1];
     		String revision = rt[0];
     		if (docType.equals("BIN")) {
     			return dataPath + FileUtil.getFS() + docid + "." + revision;
     		Hashtable<String, Object> ht = im.getDocumentInfo(localid);
     		if (ht.get("doctype").equals("BIN")) {
     			return dataPath + FileUtil.getFS() + localid;
     		} else {
     			return metadataPath + FileUtil.getFS() + docid + "." + revision;
     			return metadataPath + FileUtil.getFS() + localid;
+    		}
+    	}
     	/**
     	 *  Implementation of hazelcast MapLoader interface method.
     	 *  for the provided Identifier (as key), looks up the localID
     	 *  and revision
     	 *  For the provided Identifier (as key), returns the path to the
     	 *  document on the local filesystem.  Returns null if it can't
     	 *  create the path.
     	 */
     	@Override
     	public String load(Identifier key)
-...
     			// TODO Auto-generated catch block
     			e.printStackTrace();
     			return null;
     		} catch (SQLException e) {
     			// TODO Auto-generated catch block
     			e.printStackTrace();
+    		}
     		return path;
+    	}
     	/**
     	 *  Implementation of hazelcast MapLoader interface method.
     	 *  Implementation of hazelcast MapLoader interface method.  This method loads
     	 *  mappings for all Identifiers in the parameters.  Any Identifier not found
     	 *  is not included in the resulting map.
     	 */
     	@Override
     	public Map<Identifier, String> loadAll(Collection<Identifier> identifiers) {
-...
     				map.put(id, pathToDocid(docid));
     			} catch (McdbDocNotFoundException e) {
     				// TODO Auto-generated catch block
     				// TODO should the map load an empty path instead of
     				// leaving out the entire entry?
     				e.printStackTrace();
     			} catch (SQLException e) {
     				// TODO Auto-generated catch block
     				e.printStackTrace();
+    			}
+    		}
     		return map;
-...
     	/**
     	 * Hazelcast documents a few ways to implement this method, depending on specific
     	 * usage.  Preloading all of the GUIDs may be an unnecessarily long operation,
     	 * so this implementation returns NULL, and loading will be shifted to the other
     	 * method calls.
     	 * Return the full set of guids in the local metacat repository as
     	 * dataone Identifiers.
+    	 *
     	 * (Hazelcast allows avoiding pre-loading by returning NULL, so consider
     	 * re-implementing if that serves the purpose of this class better)
     	 */
     	@Override
     	public Set<Identifier> loadAllKeys() {
     		return null;
     		/*  ---- this would be another way to implement, using existing methods
     		 *  ---- in IdentifierManager, and DBUtil.  but it is still problematic
     		 *  ---- in how it goes from docid to GUID wrt revisions
     		 *  ----
     		 *  ---- better would be a new call to the identifier table listing all GUIDs
     		 *  ---- (from new method in IdentifierManager)
     		List<String> guids = im.getAllGUIDs();
     		Set<Identifier> set = Collections.synchronizedSet(new HashSet<Identifier>());
     		List<String> docids = null;
     		try {
     			docids = im.getAllLocalIds();
     			for(String docid : docids) {
     				Identifier id = new Identifier();
     				// TODO: need new query for going from localID to guid.
     				id.setValue(im.getGUID(docid, im.getLatestRevForLocalId(docid)));
     				set.add(id);
+    			}
     		} catch (Exception e) {
     			// TODO Auto-generated catch block
     			e.printStackTrace();
     		for (String guid : guids) {
     			Identifier id = new Identifier();
     			id.setValue(guid);
     			set.add(id);
+    		}
     		return set;
     		*/
+    	}
+    }

          * @return a list of all local ids in metacat
          */
         public List<String> getAllLocalIds()
            throws Exception
         // seems to be an unnecessary and restrictive throw -rnahf 13-Sep-2011
         //    throws Exception
+        {
             Vector<String> ids = new Vector<String>();
             String sql = "select docid from xml_documents";
-...
             return ids;
+        }
         /**
          * return a listing of all guids in the object store
          * @return a list of all GUIDs in metacat
          */
         public List<String> getAllGUIDs()
+        {
             Vector<String> guids = new Vector<String>();
             String sql = "select guid from identifier";
             DBConnection dbConn = null;
             int serialNumber = -1;
             try
+            {
                 // Get a database connection from the pool
                 dbConn = DBConnectionPool.getDBConnection("IdentifierManager.getAllGUIDs");
                 serialNumber = dbConn.getCheckOutSerialNumber();
                 // Execute the insert statement
                 PreparedStatement stmt = dbConn.prepareStatement(sql);
                 ResultSet rs = stmt.executeQuery();
                 while (rs.next())
+                {
                     String guid = rs.getString(1);
                     guids.add(guid);
+                }
                 stmt.close();
+            }
             catch (SQLException e)
+            {
                 logMetacat.error("Error while retrieving the guid: "
                         + e.getMessage());
+            }
             finally
+            {
                 // Return database connection to the pool
                 DBConnectionPool.returnDBConnection(dbConn, serialNumber);
+            }
             return guids;
+        }
         /**
          * returns a list of system metadata-only guids since the given date
          * @return a list of system ids in metacat that do not correspond to objects
          * TODO: need to check which server they are on
-...
             } catch (McdbDocNotFoundException e) {
             	// try system metadata only
             	try {
             		idExists = systemMetadataExisits(guid);
             		idExists = systemMetadataExists(guid);
                 } catch (McdbDocNotFoundException e2) {
                 	idExists = false;
+                }
-...
             return guid;
+        }
         public boolean systemMetadataExisits(String guid)
         public boolean systemMetadataExists(String guid)
     			throws McdbDocNotFoundException {
     		logMetacat.debug("looking up system metadata for guid " + guid);
     		boolean exists = false;

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 6416

Added by rnahf over 12 years ago