Project

General

Profile

« Previous | Next » 

Revision 4698

Added by daigle over 15 years ago

Renamed MetaCatUtil to MetacatUtil

View differences:

DBQuery.java
50 50

  
51 51
import edu.ucsb.nceas.metacat.service.PropertyService;
52 52
import edu.ucsb.nceas.metacat.util.AuthUtil;
53
import edu.ucsb.nceas.metacat.util.MetaCatUtil;
53
import edu.ucsb.nceas.metacat.util.MetacatUtil;
54 54
import edu.ucsb.nceas.morpho.datapackage.Triple;
55 55
import edu.ucsb.nceas.morpho.datapackage.TripleCollection;
56 56
import edu.ucsb.nceas.utilities.PropertyNotFoundException;
......
394 394
         double endHTMLTransform = System.currentTimeMillis()/1000;
395 395
          logMetacat.warn("The time to transfrom resultset from xml to html format is "
396 396
                  		                             +(endHTMLTransform -startHTMLTransform));
397
          MetaCatUtil.writeDebugToFile("---------------------------------------------------------------------------------------------------------------Transfrom xml to html  "
397
          MetacatUtil.writeDebugToFile("---------------------------------------------------------------------------------------------------------------Transfrom xml to html  "
398 398
                             +(endHTMLTransform -startHTMLTransform));
399
          MetaCatUtil.writeDebugToDelimiteredFile(" "+(endHTMLTransform -startHTMLTransform), false);
399
          MetacatUtil.writeDebugToDelimiteredFile(" "+(endHTMLTransform -startHTMLTransform), false);
400 400
        }
401 401
        catch(Exception e)
402 402
        {
......
650 650
      double queryExecuteTime = System.currentTimeMillis() / 1000;
651 651
      logMetacat.debug("Time to execute select docid query is "
652 652
                    + (queryExecuteTime - startTime));
653
      MetaCatUtil.writeDebugToFile("\n\n\n\n\n\nExecute selection query  "
653
      MetacatUtil.writeDebugToFile("\n\n\n\n\n\nExecute selection query  "
654 654
              + (queryExecuteTime - startTime));
655
      MetaCatUtil.writeDebugToDelimiteredFile(""+(queryExecuteTime - startTime), false);
655
      MetacatUtil.writeDebugToDelimiteredFile(""+(queryExecuteTime - startTime), false);
656 656

  
657 657
      boolean tableHasRows = rs.next();
658 658
      
......
761 761
     double docListTime = System.currentTimeMillis() / 1000;
762 762
     logMetacat.warn("======Total time to get docid list is: "
763 763
                          + (docListTime - startSelectionTime ));
764
     MetaCatUtil.writeDebugToFile("---------------------------------------------------------------------------------------------------------------Total selection: "
764
     MetacatUtil.writeDebugToFile("---------------------------------------------------------------------------------------------------------------Total selection: "
765 765
             + (docListTime - startSelectionTime ));
766
     MetaCatUtil.writeDebugToDelimiteredFile(" "+ (docListTime - startSelectionTime ), false);
766
     MetacatUtil.writeDebugToDelimiteredFile(" "+ (docListTime - startSelectionTime ), false);
767 767
     //if docListResult is not empty, it need to be sent.
768 768
     if (docListResult.size() != 0)
769 769
     {
......
841 841
     double endGetReturnValueFromQueryresultable = System.currentTimeMillis()/1000;
842 842
     logMetacat.warn("Time to get return fields from xml_queryresult table is (Part1 in return fields) " +
843 843
          		               (endGetReturnValueFromQueryresultable-startGetReturnValueFromQueryresultable));
844
     MetaCatUtil.writeDebugToFile("-----------------------------------------Get fields from xml_queryresult(Part1 in return fields) " +
844
     MetacatUtil.writeDebugToFile("-----------------------------------------Get fields from xml_queryresult(Part1 in return fields) " +
845 845
               (endGetReturnValueFromQueryresultable-startGetReturnValueFromQueryresultable));
846
     MetaCatUtil.writeDebugToDelimiteredFile(" " +
846
     MetacatUtil.writeDebugToDelimiteredFile(" " +
847 847
             (endGetReturnValueFromQueryresultable-startGetReturnValueFromQueryresultable),false);
848 848
     // backup the keys-elements in partOfDoclist to check later
849 849
     // if the doc entry is indexed yet
......
864 864
     double endExtendedQuery = System.currentTimeMillis()/1000;
865 865
     logMetacat.warn("Get fields from index and node table (Part2 in return fields) "
866 866
        		                                          + (endExtendedQuery - endGetReturnValueFromQueryresultable));
867
     MetaCatUtil.writeDebugToFile("-----------------------------------------Get fields from extened query(Part2 in return fields) "
867
     MetacatUtil.writeDebugToFile("-----------------------------------------Get fields from extened query(Part2 in return fields) "
868 868
             + (endExtendedQuery - endGetReturnValueFromQueryresultable));
869
     MetaCatUtil.writeDebugToDelimiteredFile(" "
869
     MetacatUtil.writeDebugToDelimiteredFile(" "
870 870
             + (endExtendedQuery - endGetReturnValueFromQueryresultable), false);
871 871
     //add relationship part part docid list for the documents in partOfDocList
872 872
     //partOfDoclist = addRelationship(partOfDoclist, qspec, dbconn, useXMLIndex);
......
928 928
     double endStoreReturnField = System.currentTimeMillis()/1000;
929 929
     logMetacat.warn("Time to store new return fields into xml_queryresult table (Part4 in return fields) "
930 930
                   + (endStoreReturnField -startStoreReturnField));
931
     MetaCatUtil.writeDebugToFile("-----------------------------------------Insert new record to xml_queryresult(Part4 in return fields) "
931
     MetacatUtil.writeDebugToFile("-----------------------------------------Insert new record to xml_queryresult(Part4 in return fields) "
932 932
             + (endStoreReturnField -startStoreReturnField));
933
     MetaCatUtil.writeDebugToDelimiteredFile(" "
933
     MetacatUtil.writeDebugToDelimiteredFile(" "
934 934
             + (endStoreReturnField -startStoreReturnField), false);
935 935
     
936 936
     Enumeration keysE = queryresultDocList.keys();
......
950 950
     double returnFieldTime = System.currentTimeMillis() / 1000;
951 951
     logMetacat.warn("======Total time to get return fields is: "
952 952
                           + (returnFieldTime - startReturnField));
953
     MetaCatUtil.writeDebugToFile("---------------------------------------------------------------------------------------------------------------"+
953
     MetacatUtil.writeDebugToFile("---------------------------------------------------------------------------------------------------------------"+
954 954
    		 "Total to get return fields  "
955 955
                                   + (returnFieldTime - startReturnField));
956
     MetaCatUtil.writeDebugToDelimiteredFile(" "+ (returnFieldTime - startReturnField), false);
956
     MetacatUtil.writeDebugToDelimiteredFile(" "+ (returnFieldTime - startReturnField), false);
957 957
     return resultset;
958 958
 }
959 959

  
......
1170 1170
               logMetacat.warn(
1171 1171
                   "Time to execute extended query: "
1172 1172
                   + (extendedQueryEnd - extendedQueryStart));
1173
               MetaCatUtil.writeDebugToFile(
1173
               MetacatUtil.writeDebugToFile(
1174 1174
                       "Execute extended query "
1175 1175
                       + (extendedQueryEnd - extendedQueryStart));
1176
               MetaCatUtil.writeDebugToDelimiteredFile(" "+ (extendedQueryEnd - extendedQueryStart), false);
1176
               MetacatUtil.writeDebugToDelimiteredFile(" "+ (extendedQueryEnd - extendedQueryStart), false);
1177 1177
               tableHasRows = rs.next();
1178 1178
               while (tableHasRows) {
1179 1179
                   ReturnFieldValue returnValue = new ReturnFieldValue();
1180 1180
                   docid = rs.getString(1).trim();
1181 1181
                   fieldname = rs.getString(2);
1182 1182
                   fielddata = rs.getString(3);
1183
                   fielddata = MetaCatUtil.normalize(fielddata);
1183
                   fielddata = MetacatUtil.normalize(fielddata);
1184 1184
                   String parentId = rs.getString(4);
1185 1185
                   fieldtype = rs.getString(5);
1186 1186
                   StringBuffer value = new StringBuffer();
......
2210 2210
        String docId = null;
2211 2211
        int version = -5;
2212 2212
        // Docid without revision
2213
        docId = MetaCatUtil.getDocIdFromString(docIdString);
2213
        docId = MetacatUtil.getDocIdFromString(docIdString);
2214 2214
        // revision number
2215
        version = MetaCatUtil.getVersionFromString(docIdString);
2215
        version = MetacatUtil.getVersionFromString(docIdString);
2216 2216

  
2217 2217
        //check if the reqused docId is a data package id
2218 2218
        if (!isDataPackageId(docId)) {
......
2314 2314
                    String documentId = (String) documentImplList.elementAt(i);
2315 2315
                    logMetacat.info("docid: " + documentId);
2316 2316
                    // Get doicd without revision
2317
                    String docidWithoutRevision = MetaCatUtil
2317
                    String docidWithoutRevision = MetacatUtil
2318 2318
                            .getDocIdFromString(documentId);
2319 2319
                    logMetacat.info("docidWithoutRevsion: "
2320 2320
                            + docidWithoutRevision);
2321 2321
                    // Get revision
2322
                    String revision = MetaCatUtil
2322
                    String revision = MetacatUtil
2323 2323
                            .getRevisionStringFromString(documentId);
2324 2324
                    logMetacat.info("revsion from docIdentifier: "
2325 2325
                            + revision);

Also available in: Unified diff