Changeset 2383 for SRUAggregator

Timestamp:

12/05/12 09:24:21 (11 years ago)

Author:

zastrow

Message:

 

Location:

SRUAggregator/trunk

Files:

• nbproject/private/private.xml (modified) (1 diff)
• src/java/clarind/fcs/SRUSearchThreaded.java (modified) (8 diffs)

SRUAggregator/trunk/nbproject/private/private.xml

@@ -2 +2 @@
 <project-private xmlns="http://www.netbeans.org/ns/project-private/1">
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
-    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
-    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/1">
-        <file>file:/Users/zastrow/Documents/ClarinD/schrauber/fcs/Aggregator/trunk/src/java/clarind/fcs/SRUSearchThreaded.java</file>
-        <file>file:/Users/zastrow/Documents/ClarinD/schrauber/fcs/Aggregator/trunk/src/java/clarind/fcs/SRUSearch.java</file>
-    </open-files>
+    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="1">
+        <file>
+            <url>src/java/clarind/fcs/SRUSearchThreaded.java</url>
+            <bookmark id="1">
+                <name/>
+                <line>97</line>
+                <key/>
+            </bookmark>
+        </file>
+    </editor-bookmarks>
 </project-private>

SRUAggregator/trunk/src/java/clarind/fcs/SRUSearchThreaded.java

@@ -33 +33 @@
     private SRUSearchThreaded() {
 
-
         org.apache.log4j.BasicConfigurator.configure(
                 new org.apache.log4j.ConsoleAppender(
@@ -40 +39 @@
         org.apache.log4j.Logger logger =
                 org.apache.log4j.Logger.getRootLogger();
-        logger.setLevel(org.apache.log4j.Level.DEBUG);
+        logger.setLevel(org.apache.log4j.Level.INFO);
         logger.getLoggerRepository().getLogger("FCS-SRUSEARCH").setLevel(
-                org.apache.log4j.Level.DEBUG);
+                org.apache.log4j.Level.INFO);
 
         this.client = new SRUThreadedClient();
@@ -83 +82 @@
         Future<SRUSearchRetrieveResponse> result = client.searchRetrieve(request);
 
-        //  printSearchResponse(result.get());
-
         if (result.get().hasRecords()) {
             for (SRURecord record : result.get().getRecords()) {
@@ -94 +91 @@
                     ClarinFCSRecordData rd =
                             (ClarinFCSRecordData) record.getRecordData();
-                    // dumpResource(rd.getResource());
+        
                     Resource resource = rd.getResource();
+                    
+                    // If dataviews are assigned directly to the resource:                    
                     if (resource.hasDataViews()) {
-                        zeilen = dataViews2Rows(resource.getDataViews());
-                        //dumpDataView("CLARIN-FCS: ", resource.getDataViews());
+                        zeilen.addAll(dataViews2Rows(resource.getDataViews()));                   
                     }
+                    
+                    // If there are resource fragments:
                     if (resource.hasResourceFragments()) {
                         for (Resource.ResourceFragment fragment : resource.getResourceFragments()) {
@@ -106 +106 @@
                             if (fragment.hasDataViews()) {
                                 zeilen.addAll(dataViews2Rows(fragment.getDataViews()));
-                                //dumpDataView("CLARIN-FCS: ResourceFragment/", fragment.getDataViews());
                             }
                         }
-                    }
+                    } //ResourceFragments
 
                 } else if (record.isRecordSchema(SRUSurrogateRecordData.RECORD_SCHEMA)) {
@@ -125 +124 @@
             logger.info("no results");
         }
-
-
-//        for (SRURecord record : result.get().getRecords()) {
-//            if (record.isRecordSchema(ClarinFCSRecordData.RECORD_SCHEMA)) {
-//                ClarinFCSRecordData r =
-//                        (ClarinFCSRecordData) record.getRecordData();
-//                Row row = new Row();
-//                
-//                Label toTheLeft = new Label();
-//                toTheLeft.setMultiline(true);                
-//               // toTheLeft.setValue(r.getLeft());
-//                toTheLeft.setSclass("word-wrap");
-//                
-//                row.appendChild(toTheLeft);
-//                //Label l = new Label(r.getKeyword());
-//                //l.setStyle("color:#8f3337;");
-//                //l.setMultiline(true);
-//               // l.setSclass("word-wrap");
-//                //row.appendChild(l);
-//                
-//                 Label toTheRight = new Label();
-//                toTheRight.setMultiline(true);
-//                toTheRight.setSclass("word-wrap");
-//              //  toTheRight.setValue(r.getRight());
-//                
-//                row.appendChild(toTheRight);
-//
-//                zeilen.add(row);
-//
-//            } else if (record.isRecordSchema(SRUSurrogateRecordData.RECORD_SCHEMA)) {
-//                SRUSurrogateRecordData r =
-//                        (SRUSurrogateRecordData) record.getRecordData();
-//
-//            } else {
-//                System.out.println("Unknown record schema");
-//            }
-//        } // for record
         return zeilen;
     }
@@ -168 +130 @@
         ArrayList arrayOfRows = new ArrayList<Row>();
         for (DataView dataview : dataviews) {
+           
+            // ***** Handling the KWIC dataviews
             if (dataview.isMimeType(KWICDataView.MIMETYPE)) {
                 KWICDataView kw = (KWICDataView) dataview;
@@ -193 +157 @@
 
                 arrayOfRows.add(row);
-
             }
         } // for