Project

General

Profile

« Previous | Next » 

Revision 5411

Added by berkley almost 14 years ago

fixed error with listObjects and get.

View differences:

CrudService.java
464 464
                  "identifier", "objectFormat", "dateSysMetadataModified", "checksum", "checksum/@algorithm"});
465 465
          params.put("anyfield", new String[] {"%"});
466 466
          
467
          System.out.println("query is: metacatUrl: " + metacatUrl + " user: " + sessionData.getUserName() +
468
              " sessionid: " + sessionData.getId() + " params: " + params.toString());
467
          //System.out.println("query is: metacatUrl: " + metacatUrl + " user: " + sessionData.getUserName() +
468
          //    " sessionid: " + sessionData.getId() + " params: " + params.toString());
469 469
          
470 470
          MetacatResultSet rs = handler.query(metacatUrl, params, sessionData.getUserName(), 
471 471
                  sessionData.getGroupNames(), sessionData.getId());
......
475 475
              count = docs.size();
476 476
          }
477 477
          
478
          System.out.println("query returned " + count + " documents.");
478
          //System.out.println("query returned " + count + " documents.");
479 479
          
480 480
          for(int i=start; i<count; i++)
481 481
          {
......
533 533
              id.setValue(d.getField("identifier"));
534 534
              info.setIdentifier(id);
535 535
              info.setObjectFormat(returnedObjectFormat);
536
              //info.setSize(new Long(d.getField("size").trim()).longValue());
536
              info.setSize(new Long(d.getField("size").trim()).longValue());
537 537
              //add the ObjectInfo to the ObjectList
538 538
              ol.addObjectInfo(info);
539
              //System.out.println("adding doc " + i + " to the objectList");
540 539
          }
541 540
      }
542 541
      catch(Exception e)
......
548 547
      EventLog.getInstance().log(metacatUrl,
549 548
              username, null, "read");
550 549
      logCrud.info("listObjects");
551
      System.out.println("ol.size: " + ol.sizeObjectInfoList());
550
      //System.out.println("ol.size: " + ol.sizeObjectInfoList());
551
      ol.setCount(ol.sizeObjectInfoList());
552
      ol.setStart(0);
553
      ol.setTotal(ol.sizeObjectInfoList());
552 554
      return ol;
553 555
    }
554 556
    
......
932 934
        
933 935
        // if the session id is registered in SessionService, get the
934 936
        // SessionData for it. Otherwise, use the public session.
935
        System.out.println("sessionid: " + sessionId);
937
        //System.out.println("sessionid: " + sessionId);
936 938
        if (sessionId != null &&
937 939
            !sessionId.toLowerCase().equals("public") &&
938 940
            SessionService.getInstance().isSessionRegistered(sessionId)) 
939 941
        {
940
            System.out.println("looking for registered session");
941 942
            sessionData = SessionService.getInstance().getRegisteredSession(sessionId);
942 943
        } else {
943
            System.out.println("returning public session");
944 944
            sessionData = SessionService.getInstance().getPublicSession();
945 945
        }
946
       
947
	System.out.println("Session user is now: " + sessionData.getUserName());
948
 
946
        
949 947
        return sessionData;
950 948
    }
951 949

  

Also available in: Unified diff