/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 5186

Added by Jing Tao over 14 years ago

Fix the bug of http://bugzilla.ecoinformatics.org/show_bug.cgi?id=4645. handleGetRevisionAndDocTypeAction will search both xml_documents and xml_revisions table.
It also changed some constrain in AccessionNumber when user update a document, of which all previous versions are in xml_revisions table.

src/edu/ucsb/nceas/metacat/DocumentImpl.java
1984	1984	// if we couldn't find it in xml_documents we
1985	1985	// need to find it in xml_revision table
1986	1986	Vector<Integer> revList = DBUtil.getRevListFromRevisionTable(docid);
1987		for (int i=0; i<revList.size(); i++)
	1987	/*for (int i=0; i<revList.size(); i++)
1988	1988	{
1989	1989	// Integer k = (Integer) revList.elementAt(i);
1990	1990	// System.out.println("The rev in xml_revision table "+ k.toString());
...	...
1993	1993	if (revList.contains(new Integer(revision)))
1994	1994	{
1995	1995	return true;
	1996	}*/
	1997	if(revList != null && !revList.isEmpty())
	1998	{
	1999	return true;
1996	2000	}
1997	2001	}
1998	2002	// Get miss docid and rev, throw to McdDocNotFoundException

           pstmt.execute();
           ResultSet rs = pstmt.getResultSet();
           hasCurrentAccNumber = rs.next();
           if(!hasCurrentAccNumber)
+          {
             //need to look xml_revision table;
             pstmt = conn.prepareStatement(
                 "SELECT 'x' FROM xml_revisions " +
                 "WHERE docid = ?");
             pstmt.setString(1, accNumber);
             pstmt.execute();
             rs = pstmt.getResultSet();
             hasCurrentAccNumber = rs.next();
+          }
           pstmt.close();
         } catch (SQLException e) {
-...
           ResultSet rs = pStmt.getResultSet();
           boolean hasRow = rs.next();
           rev = rs.getInt(1);
           if(hasRow)
+          {
             rev = rs.getInt(1);
+          }
           pStmt.close();
         } catch (SQLException e) {

       //private Connection	conn = null;
       private static Logger logMetacat = Logger.getLogger(DBUtil.class);
       private static int MAXMUM = -2;
       public static int NONEEXIST = -1;
       /**
        * main routine used for testing.
-...
           }//if
           else
+          {
             // No record, throw a exception
             throw new
                   SQLException("DBUtil.getCurrentRevisionAndDocTypeForGivenDocument - " +
                 		  "There is no record for given docid: " + givenDocId);
             //search xml_revision table
             Vector<Integer> revisionList = getRevListFromRevisionTable(docIdWithoutRevision);
             if(revisionList == null || revisionList.isEmpty())
+            {
               // No record, throw a exception
               throw new
                     SQLException("DBUtil.getCurrentRevisionAndDocTypeForGivenDocument - " +
                         "There is no record for given docid: " + givenDocId);
+            }
             else
+            {
               int maxRev = getMaxmumNumber(revisionList);
               if(maxRev == MAXMUM)
+              {
                 throw new
                 SQLException("DBUtil.getCurrentRevisionAndDocTypeForGivenDocument - " +
                     "There is no record for given docid: " + givenDocId);
+              }
               revision = (new Integer(maxRev)).toString();
               sqlCommand = "select doctype from xml_revisions where docid like '"+docIdWithoutRevision+"' and rev="+maxRev;
               pstmt = dbConn.prepareStatement(sqlCommand);
               // Execute the prepared statement
               pstmt.execute();
               // Get result set
               rs = pstmt.getResultSet();
               // If there is some record
               if (rs.next())
+              {
                 docType = rs.getString(1);
               }//if
+            }
           }//else
+        }
-...
         return revision+";"+docType;
       }//getCurrentRevisionAndDocTypeForGivenDocument
       /*
        * Gets the maxium number in a given vector.
        */
       private static int getMaxmumNumber(Vector<Integer>list)
+      {
         Integer max = null;
         if(list != null)
+        {
           for(int i=0; i<list.size(); i++)
+          {
             if(i ==0)
+            {
               max = list.elementAt(i);
+            }
             else
+            {
               if(max == null)
+              {
                 max = list.elementAt(i);
+              }
               else
+              {
                 Integer current = list.elementAt(i);
                 if(current != null && current.intValue() > max.intValue())
+                {
                   max = current;
+                }
+              }
+            }
+          }
+        }
         if(max != null)
+        {
           return max.intValue();
+        }
         else
+        {
           return MAXMUM;
+        }
+      }
       /**
        * Method to return a rev list in xml_revision for given docid.
        * @param docId
-...
                   rev = rs.getInt(1);
                   pStmt.close();
               } else {
                   rev = -1;
                   rev = NONEEXIST;
                   pStmt.close();
+              }
           }//try
-...
           return rev;
+      }
+    }

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 5186

Added by Jing Tao over 14 years ago