From 0c28cabf0d496be24da3e5ee414a8fcd925250ab Mon Sep 17 00:00:00 2001
From: Tyler Schicke <tyler_schicke@brown.edu>
Date: Fri, 3 May 2019 01:42:54 -0400
Subject: Got part of search working

---
 src/server/Search.ts   | 13 ++++++-------
 src/server/database.ts | 12 ------------
 src/server/index.ts    |  4 ++--
 3 files changed, 8 insertions(+), 21 deletions(-)

(limited to 'src')

diff --git a/src/server/Search.ts b/src/server/Search.ts
index bcea03d5c..9e462f0ae 100644
--- a/src/server/Search.ts
+++ b/src/server/Search.ts
@@ -1,15 +1,16 @@
 import * as rp from 'request-promise';
 import { Database } from './database';
+import { thisExpression } from 'babel-types';
 
 export class Search {
     public static Instance = new Search();
     private url = 'http://localhost:8983/solr/';
 
-    public updateDocument(document: any): rp.RequestPromise {
-        console.log(JSON.stringify(document));
-        return rp.post(this.url + "dash/update/json/docs", {
+    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)
+            body: JSON.stringify([document])
         });
     }
 
@@ -21,9 +22,7 @@ export class Search {
         }));
         const fields = searchResults.response.docs;
         const ids = fields.map((field: any) => field.id);
-        const docs = await Database.Instance.searchQuery(ids);
-        const docIds = docs.map((doc: any) => doc._id);
-        return docIds;
+        return ids;
     }
 
     public async clear() {
diff --git a/src/server/database.ts b/src/server/database.ts
index 1e8004328..a61b4d823 100644
--- a/src/server/database.ts
+++ b/src/server/database.ts
@@ -74,18 +74,6 @@ export class Database {
         });
     }
 
-    public searchQuery(ids: string[], collectionName = Database.DocumentsCollection): Promise<any> {
-        return new Promise<any>(resolve => {
-            this.db && this.db.collection(collectionName).find({ "data.field": { "$in": ids } }).toArray((err, docs) => {
-                if (err) {
-                    console.log(err.message);
-                    console.log(err.errmsg);
-                }
-                resolve(docs);
-            });
-        });
-    }
-
     public print() {
         console.log("db says hi!");
     }
diff --git a/src/server/index.ts b/src/server/index.ts
index b57e5c482..b4252c2a1 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -316,8 +316,8 @@ function UpdateField(socket: Socket, diff: Diff) {
     }
     var merged = {};
     _.extend(merged, docid, docfield);
-    console.log(merged);
-    console.log(docfield);
+    console.log("MERGED: ", merged);
+    console.log("DOC_FIELD: ", docfield);
     if (dynfield) {
         console.log("dynamic field detected!");
         Search.Instance.updateDocument(merged);
-- 
cgit v1.2.3-70-g09d2