Changeset 2232 for trunk/java-client

Timestamp:

2001-03-31T22:44:29+12:00 (23 years ago)

Author:

say1

Message:

changed corbaiface.idl "long"->"long long" and propogated the chnages ... also added comments to the idl file.

Location:

trunk/java-client

Files:

• corbaiface.idl (modified) (7 diffs)
• org/nzdl/gsdl/SearchAllCollections.java (modified) (1 diff)
• org/nzdl/gsdl/service/NzdlQueryHit.java (modified) (9 diffs)
• org/nzdl/gsdl/service/NzdlResponse.java (modified) (2 diffs)
• org/nzdl/gsdl/service/NzdlResultSet.java (modified) (5 diffs)

trunk/java-client/corbaiface.idl

@@ -17 +17 @@
   usString text;
   unsigned short encoding;
-  unsigned long  length;
+  unsigned long long length;
 };
 
@@ -64 +64 @@
   corbatext_t host;
   // ???
-  long        response;
+  long long   response;
 };
 
 struct corbaColInfoResponse
 {
-  corbaShortColInfo shoftInfo;
+  corbaShortColInfo   shoftInfo;
   // the collection is public
-  boolean           isPublic;
+  boolean             isPublic;
   // the collection is reliable
-  boolean           isBeta;
+  boolean             isBeta;
   // the timestamp of the collection building
-  unsigned long     buildDate;
-  // ???
-  corbatext_tarray  ccsCols;        // Added 05/04/2000
-  // ???
-  corbatext_tarray  languages;
+  unsigned long long       buildDate;
+  // ???
+  corbatext_tarray    ccsCols;        // Added 05/04/2000
+  // ???
+  corbatext_tarray    languages;
   // the number of documents in the collection
-  unsigned long     numDocs;
+  unsigned long long  numDocs;
   // the number of words in the collection
-  unsigned long     numWords;
+  unsigned long long  numWords;
   // the number of bytes in the collection
-  unsigned long     numBytes;
+  unsigned long long  numBytes;
   // the collection level metadata
   corbatext_tmap    collectionMeta;
@@ -173 +173 @@
   corbaOptionValue_array filterOptions;
   corbatext_tarray       docSet;
-  long                   filterResultOptions;
+  long long                   filterResultOptions;
   corbatext_t            requestParams;
   corbatext_t            refParams;
@@ -183 +183 @@
 {
   corbatext_t      term;
-  long             frequency;
+  long long        frequency;
   corbatext_tarray matchTerms;
 };
@@ -194 +194 @@
   boolean          isRef;
   corbatext_tarray values;
-  long             id;
-  long             parentid; // dodge for avoiding pointers for the moment
+  long long             id;
+  long long             parentid; // dodge for avoiding pointers for the moment
 };
 
@@ -206 +206 @@
 };
 
-typedef sequence<long> corbaDocFreq_array;
+typedef sequence<long long> corbaDocFreq_array;
 
 struct corbaResultDocInfo
 {
   corbatext_t             OID;
-  long                    resultNum;
-  long                    ranking;
-  long                    termsMatched;
-  long                    phraseMatched;
+  long long                    resultNum;
+  long long                    ranking;
+  long long                    termsMatched;
+  long long                    phraseMatched;
   corbaDocFreq_array      docFreq;
   corbaMetadataInfo_map   metadata;
   corbatext_t             classifierMetadataType;    // Added 05/04/2000
-  long                    classifierMetadataOffset;  // Added 05/04/2000
+  long long                    classifierMetadataOffset;  // Added 05/04/2000
   corbaMetadataInfo_array metaparents;
 };
@@ -233 +233 @@
 struct corbaFilterResponse
 {
-  long                     numDocs;
+  long long                     numDocs;
   corbaIsApprox            isApprox;
   corbaTermInfo_array      termInfo;

trunk/java-client/org/nzdl/gsdl/SearchAllCollections.java

@@ -273 +273 @@
     nzdl.service( collectionName, request, response );
     
-    int frequency = response.getResultSet().getNumOfDocs();
+    long frequency = response.getResultSet().getNumOfDocs();
     if (frequency > 0) {
         System.out.println("\n------------------------------");

trunk/java-client/org/nzdl/gsdl/service/NzdlQueryHit.java

@@ -38 +38 @@
 
   private String m_docID = null;
-  private int    m_resultNum = -1;   // I don't actually know what it means !!!
-  private int    m_ranking = -1;
-  private int    m_numTermsMatched = -1;
-  private int    m_numPhrasesMatched = -1;
-  private int [] m_docFreqs = null; // I don't actually know what it means !!!
+  private long    m_resultNum = -1;   // I don't actually know what it means !!!
+  private long    m_ranking = -1;
+  private long    m_numTermsMatched = -1;
+  private long    m_numPhrasesMatched = -1;
+  private long [] m_docFreqs = null; // I don't actually know what it means !!!
   /*
    * The key in the map will be the metaData Tag
@@ -60 +60 @@
   /**
    * Sets the ranking.
-   * @param the ranking an integer representaion of the the hit's ranking.
+   * @param the ranking an longeger representaion of the the hit's ranking.
    */
-  public void setRanking( int _ranking ) {
+  public void setRanking( long _ranking ) {
     m_ranking = _ranking;
   }
@@ -68 +68 @@
   /**
    * Sets the result number.
-   * @param resultNum is the integer representation of the result number.
+   * @param resultNum is the longeger representation of the result number.
    */
-  public void setResultNumber( int _resultNum ) {
+  public void setResultNumber( long _resultNum ) {
     m_resultNum = _resultNum;
   }
@@ -78 +78 @@
    * @param numTermsMatched the number of terms matched.
    */
-  public void setNumOfTermsMatched( int _numTermsMatched ) {
+  public void setNumOfTermsMatched( long _numTermsMatched ) {
     m_numTermsMatched = _numTermsMatched;
   }
@@ -86 +86 @@
    * @param numPhrasesMatched the number of phrases matched.
    */
-  public void setNumOfPhrasesMatched( int _numPhrasesMatched ) {
+  public void setNumOfPhrasesMatched( long _numPhrasesMatched ) {
     m_numPhrasesMatched = _numPhrasesMatched;
   }
@@ -110 +110 @@
   /**
    * Gets the ranking of the query hit.
-   * @return integer representing the hits ranking.
+   * @return longeger representing the hits ranking.
    */
-  public int getRanking() {
+  public long getRanking() {
     return m_ranking;
   }
@@ -118 +118 @@
   /**
    * Gets the result number of the query hit.
-   * @return integer representing the result number.
+   * @return longeger representing the result number.
    */
-  public int getResultNumber() {
+  public long getResultNumber() {
     return m_resultNum;
   }
@@ -127 +127 @@
    * Gets the number of terms matched in the hit. A term is an individual word
    * in a query phrase.
-   * @return integer representing the number of terms matched.
+   * @return longeger representing the number of terms matched.
    */
-  public int getNumOfTermsMatched() {
+  public long getNumOfTermsMatched() {
     return m_numTermsMatched;
   }
@@ -135 +135 @@
   /**
    * Gets the number of phrases matched in the hit.
-   * @return integer representing the number of phrases matched.
+   * @return longeger representing the number of phrases matched.
    */
-  public int getNumOfPhrasesMatched() {
+  public long getNumOfPhrasesMatched() {
     return m_numPhrasesMatched;
   }

trunk/java-client/org/nzdl/gsdl/service/NzdlResponse.java

@@ -61 +61 @@
 
   /**
-   * Create an empty instance of a NzdlResponse object.
+   * 
    */
   public void copyData(NzdlResponse old) {
@@ -178 +178 @@
       term = NzdlCorbaFactory.toString(_termsInfo[i].term);
       m_queryTerms.add( term );
-      m_frequencies.put( term, new Integer(_termsInfo[i].frequency) );
+      m_frequencies.put( term, new Long(_termsInfo[i].frequency) );
     }
     m_resultSet.setQueryTerms( m_queryTerms );

trunk/java-client/org/nzdl/gsdl/service/NzdlResultSet.java

@@ -41 +41 @@
 
   private List m_resultSet   = null;
-  private int m_numDocs     = -1;
-  private int m_resultType  = -1;
+  private long m_numDocs     = -1;
+  private long m_resultType  = -1;
   private List m_queryTerms  = null;
   private List m_docIDs = null;
@@ -80 +80 @@
    * @param num the number of documents in the result set
    */
-  public void setNumOfDocs( int _num ) {
+  public void setNumOfDocs( long _num ) {
     m_numDocs = _num;
   }
@@ -89 +89 @@
    * @param type an integer representing the result type.
    */
-  public void setResultType( int _type ) {
+  public void setResultType( long _type ) {
     m_resultType = _type;
   }
@@ -121 +121 @@
    * by the maxDocs set in {@link NzdlQuery NzdlQuery}
    */
-  public int getNumOfDocs() {
+  public long getNumOfDocs() {
     return m_numDocs;
   }
@@ -132 +132 @@
    * @return result type as an integer.
    */
-  public int getResultType() {
+  public long getResultType() {
     return m_resultType;
   }