Added copy fields to search to enable easier searching

3 files changed, 10 insertions, 32 deletions

diff --git a/solr/conf/schema.xml b/solr/conf/schema.xml
index 5e80b17d9..99087a1db 100644
--- a/solr/conf/schema.xml
+++ b/solr/conf/schema.xml
@@ -40,10 +40,17 @@
   <fieldType name="pdate" class="solr.DatePointField" docValues="true"/>
   <fieldType name="pdouble" class="solr.DoublePointField" docValues="true"/>
 
-  <field name="data" type="text" indexed="true" stored="true" uninvertible="false"/>
+  <field name="text" type="text" indexed="true" stored="false" uninvertible="false" multiValued="true"/>
   <field name="id" type="string" indexed="true" stored="true" uninvertible="false" required="true"/>
   <field name="_version_" type="plong" indexed="false" stored="false"/>
 
-  <dynamicField name="*_t" type="string" indexed="true" stored="true"/>
-  <dynamicField name="*_n" type="pdouble" indexed="true" stored="true"/>
+  <dynamicField name="*_t" type="text" indexed="true" stored="true" uninvertible="false"/>
+  <dynamicField name="*_n" type="pdouble" indexed="true" stored="true" uninvertible="false"/>
+
+  <dynamicField name="*_a" type="text" indexed="true" stored="false" uninvertible="false"/>
+
+  <copyField source="*_t" dest="text"/>
+
+  <copyField source="*_t" dest="*_a"/>
+  <copyField source="*_n" dest="*_a"/>
 </schema>
diff --git a/src/server/Search.ts b/src/server/Search.ts
index 4911edd1d..59bdd4803 100644
--- a/src/server/Search.ts
+++ b/src/server/Search.ts
@@ -5,34 +5,8 @@ import { thisExpression } from 'babel-types';
 export class Search {
     public static Instance = new Search();
     private url = 'http://localhost:8983/solr/';
-    private client: any;
-
-    constructor() {
-        console.log("Search Instantiated!");
-        var SolrNode = require('solr-node');
-        this.client = new SolrNode({
-            host: 'localhost',
-            port: '8983',
-            core: 'dash',
-            protocol: 'http'
-        });
-        var strQuery = this.client.query().q('text:test');
-
-        console.log(strQuery);
-
-        // Search documents using strQuery
-        // client.search(strQuery, (err: any, result: any) => {
-        //     if (err) {
-        //         console.log(err);
-        //         return;
-        //     }
-        //     console.log('Response:', result.response);
-        // });
-    }
-
 
     public async updateDocument(document: any) {
-        console.log("UPDATE: ", JSON.stringify(document));
         return rp.post(this.url + "dash/update", {
             headers: { 'content-type': 'application/json' },
             body: JSON.stringify([document])
diff --git a/src/server/index.ts b/src/server/index.ts
index 6b92e8e8e..44251de3d 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -308,7 +308,6 @@ function UpdateField(socket: Socket, diff: Diff) {
         return;
     }
     const update: any = { id: diff.id };
-    console.log("FIELD: ", docfield);
     let dynfield = false;
     for (let key in docfield) {
         if (!key.startsWith("fields.")) continue;
@@ -322,14 +321,12 @@ function UpdateField(socket: Socket, diff: Diff) {
         }
     }
     if (dynfield) {
-        console.log("dynamic field detected!");
         Search.Instance.updateDocument(update);
     }
 }
 
 function CreateField(newValue: any) {
     Database.Instance.insert(newValue, "newDocuments");
-    console.log("created field");
 }
 
 server.listen(serverPort);