Project

General

Profile

« Previous | Next » 

Revision 4698

Added by daigle over 15 years ago

Renamed MetaCatUtil to MetacatUtil

View differences:

Eml200SAXHandler.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.utilities.PropertyNotFoundException;
55 55

  
56 56
/**
......
597 597
                //intitialize namespace hash for in line data
598 598
                inlineDataNameSpace = new Hashtable();
599 599
                //initialize file writer
600
                String docidWithoutRev = MetaCatUtil.getDocIdFromString(docid);
600
                String docidWithoutRev = MetacatUtil.getDocIdFromString(docid);
601 601
                String seperator = ".";
602 602
                try {
603 603
					seperator = PropertyService.getProperty("document.accNumSeparator");
......
652 652
                        && (processAdditionalAccess || processOtherAccess || processTopLeverAccess)) {
653 653
                    // stored the pull out nodes into storedNode stack
654 654
                    NodeRecord nodeElement = new NodeRecord(-2, -2, -2, "TEXT",
655
                            null, null, MetaCatUtil.normalize(textBuffer
655
                            null, null, MetacatUtil.normalize(textBuffer
656 656
                                    .toString()));
657 657
                    storedAccessNodeStack.push(nodeElement);
658 658

  
......
918 918
            {
919 919
                // stored the pull out nodes into storedNode stack
920 920
                NodeRecord nodeElement = new NodeRecord(-2, -2, -2, "ELEMENT",
921
                        localName, prefix, MetaCatUtil.normalize(null));
921
                        localName, prefix, MetacatUtil.normalize(null));
922 922
                storedAccessNodeStack.push(nodeElement);
923 923
                for (int i = 0; i < atts.getLength(); i++) {
924 924
                    String attributeName = atts.getQName(i);
925 925
                    String attributeValue = atts.getValue(i);
926 926
                    NodeRecord nodeAttribute = new NodeRecord(-2, -2, -2,
927
                            "ATTRIBUTE", attributeName, null, MetaCatUtil
927
                            "ATTRIBUTE", attributeName, null, MetacatUtil
928 928
                                    .normalize(attributeValue));
929 929
                    storedAccessNodeStack.push(nodeAttribute);
930 930
                }
......
944 944
              // we started process additional access rules here
945 945
              // because access and describe couldn't be seperated
946 946
              NodeRecord nodeElement = new NodeRecord(-2, -2, -2, "ELEMENT",
947
                        localName, prefix, MetaCatUtil.normalize(null));
947
                        localName, prefix, MetacatUtil.normalize(null));
948 948
              storedAccessNodeStack.push(nodeElement);
949 949
              processAdditionalAccess = true;
950 950
              logMetacat.warn("set processAdditonalAccess ture when meet describe");
......
1053 1053
                {
1054 1054
                     // stored the pull out nodes into storedNode stack
1055 1055
                     NodeRecord nodeElement = new NodeRecord(-2, -2, -2, "TEXT",
1056
                       null, null, MetaCatUtil.normalize(textBuffer
1056
                       null, null, MetacatUtil.normalize(textBuffer
1057 1057
                          .toString()));
1058 1058
                     storedAccessNodeStack.push(nodeElement);
1059 1059

  
......
1283 1283
                        && (processAdditionalAccess || processOtherAccess || processTopLeverAccess)) {
1284 1284
                    // stored the pull out nodes into storedNode stack
1285 1285
                    NodeRecord nodeElement = new NodeRecord(-2, -2, -2, "TEXT",
1286
                            null, null, MetaCatUtil.normalize(textBuffer
1286
                            null, null, MetacatUtil.normalize(textBuffer
1287 1287
                                    .toString()));
1288 1288
                    storedAccessNodeStack.push(nodeElement);
1289 1289

  
......
1542 1542
                        && (processAdditionalAccess || processOtherAccess || processTopLeverAccess)) {
1543 1543
                    // stored the pull out nodes into storedNode stack
1544 1544
                    NodeRecord nodeElement = new NodeRecord(-2, -2, -2,
1545
                            "COMMENT", null, null, MetaCatUtil.normalize(str));
1545
                            "COMMENT", null, null, MetacatUtil.normalize(str));
1546 1546
                    storedAccessNodeStack.push(nodeElement);
1547 1547

  
1548 1548
                }
......
1649 1649
                        && (processAdditionalAccess || processOtherAccess || processTopLeverAccess)) {
1650 1650
                    // stored the pull out nodes into storedNode stack
1651 1651
                    NodeRecord nodeElement = new NodeRecord(-2, -2, -2, "TEXT",
1652
                            null, null, MetaCatUtil.normalize(data));
1652
                            null, null, MetacatUtil.normalize(data));
1653 1653
                    storedAccessNodeStack.push(nodeElement);
1654 1654

  
1655 1655
                }
......
2092 2092
        throw new SAXException("The access object is null");
2093 2093
      }
2094 2094
       // get rid of rev from dataId
2095
       //dataId = MetaCatUtil.getDocIdFromString(dataId);
2095
       //dataId = MetacatUtil.getDocIdFromString(dataId);
2096 2096
       //String permOrder = accessSection.getPermissionOrder();
2097 2097
       String sql = null;
2098 2098
       PreparedStatement pstmt = null;
......
2657 2657
      String docid = null;
2658 2658
      // if the url is not a ecogrid protocol, null will be getten
2659 2659
      String accessionNumber =
2660
                 MetaCatUtil.getAccessionNumberFromEcogridIdentifier(url);
2660
                 MetacatUtil.getAccessionNumberFromEcogridIdentifier(url);
2661 2661
      if (accessionNumber != null)
2662 2662
      {
2663 2663
        // handle ecogrid protocol
2664 2664
        // get rid of revision number to get the docid.
2665
        docid = MetaCatUtil.getDocIdFromAccessionNumber(accessionNumber);
2665
        docid = MetacatUtil.getDocIdFromAccessionNumber(accessionNumber);
2666 2666
        onlineDataFileIdInRelationVector.add(docid);
2667 2667
        try
2668 2668
        {

Also available in: Unified diff