Project

General

Profile

« Previous | Next » 

Revision 3248

Added by Jing Tao about 17 years ago

Remove the access query for return field since we remove the partial tree access control in eml.

View differences:

DBQuery.java
1074 1074
          Hashtable controlPairs = new Hashtable();
1075 1075
          double extendedQueryStart = System.currentTimeMillis() / 1000;
1076 1076
          doclist.deleteCharAt(doclist.length() - 1); //remove the last comma
1077
          boolean tableHasRows = false;
1077 1078
          // check if user has permission to see the return field data
1078
          String accessControlSQL =
1079
          /*String accessControlSQL =
1079 1080
                 qspec.printAccessControlSQLForReturnField(doclist.toString());
1080 1081
          pstmt = dbconn.prepareStatement(accessControlSQL);
1081 1082
          //increase dbconnection usage count
1082 1083
          dbconn.increaseUsageCount(1);
1083 1084
          pstmt.execute();
1084 1085
          rs = pstmt.getResultSet();
1085
          boolean tableHasRows = rs.next();
1086
          tableHasRows = rs.next();
1086 1087
          while (tableHasRows)
1087 1088
          {
1088 1089
            long startNodeId = rs.getLong(1);
1089 1090
            long endNodeId = rs.getLong(2);
1090 1091
            controlPairs.put(new Long(startNodeId), new Long(endNodeId));
1091 1092
            tableHasRows = rs.next();
1092
          }
1093
          }*/
1093 1094

  
1094 1095
           double extendedAccessQueryEnd = System.currentTimeMillis() / 1000;
1095 1096
           logMetacat.info( "Time for execute access extended query: "
1096 1097
                          + (extendedAccessQueryEnd - extendedQueryStart));
1097 1098

  
1098 1099
           String extendedQuery =
1099
               qspec.printExtendedSQL(doclist.toString(), controlPairs, useXMLIndex);
1100
               qspec.printExtendedSQL(doclist.toString(), useXMLIndex);
1100 1101
           logMetacat.info("Extended query: " + extendedQuery);
1101 1102

  
1102 1103
           if(extendedQuery != null){

Also available in: Unified diff