reuse log

kennsippell · Jun 23, 2016 · 254cd99 · 254cd99
1 parent 74f2640
commit 254cd99
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 17 deletions.
diff --git a/java_parser/src/main/java/yasp/Main.java b/java_parser/src/main/java/yasp/Main.java
@@ -455,7 +455,14 @@ public void processWardEntity(Context ctx, Entity e, boolean entityLeft)
             entry.x = x;
             entry.y = y;
             entry.z = z;
-            entry.type = isObserver ? "obs" : "sen";
+            if (entityLeft)
+            {
+                entry.type = isObserver ? "obs_left" : "sen_left";
+            }
+            else
+            {
+                entry.type = isObserver ? "obs" : "sen";
+            }
             entry.key = Arrays.toString(pos);
             entry.entityleft = entityLeft;
             entry.ehandle = e.getHandle();

diff --git a/processors/populate.js b/processors/populate.js
@@ -7,9 +7,6 @@ function populate(e, container)
         case 'player_slot':
             container.players[e.key].player_slot = e.value;
             break;
-        case 'log':
-            container.log.push(JSON.parse(JSON.stringify(e)));
-            break;
         case 'chat':
             container.chat.push(JSON.parse(JSON.stringify(e)));
             break;
@@ -92,5 +89,4 @@ function populate(e, container)
             break;
     }
 }
-
 module.exports = populate;
diff --git a/processors/processExpand.js b/processors/processExpand.js
@@ -428,9 +428,6 @@ function processExpand(entries, meta)
             var e2 = JSON.parse(JSON.stringify(e));
             e2.type = "obs_log";
             expand(e2);
-            var e4 = JSON.parse(JSON.stringify(e));
-            e4.type = "log";
-            expand(e4);
             var e3 = JSON.parse(JSON.stringify(e));
             //key is a JSON array of position data
             e3.key = JSON.parse(e3.key);
@@ -442,14 +439,11 @@ function processExpand(entries, meta)
             var e2 = JSON.parse(JSON.stringify(e));
             e2.type = "sen_log";
             expand(e2);
-            var e4 = JSON.parse(JSON.stringify(e));
-            e4.type = "log";
-            expand(e4);
             var e3 = JSON.parse(JSON.stringify(e));
             e3.key = JSON.parse(e3.key);
             e3.posData = true;
             expand(e3);
-        }
+        },
     };
     //define the types we want to put into each array
     //null means all types

diff --git a/sql/cassandra.cql b/sql/cassandra.cql
@@ -25,8 +25,7 @@ CREATE TABLE matches (
   radiant_gold_adv text,
   radiant_xp_adv text,
   teamfights text,
-  version int,
-  log text,
+  version int
 );
 
 CREATE TABLE player_matches (

diff --git a/sql/create_tables.sql b/sql/create_tables.sql
@@ -37,8 +37,7 @@ CREATE TABLE matches (
   radiant_gold_adv integer[],
   radiant_xp_adv integer[],
   teamfights json[],
-  version integer,
-  log json[]
+  version integer
   );
 
 CREATE TABLE player_matches (

diff --git a/util/utility.js b/util/utility.js
@@ -357,7 +357,6 @@ function getParseSchema()
         "teamfights": [],
         "objectives": [],
         "chat": [],
-        "log": [],
         "radiant_gold_adv": [],
         "radiant_xp_adv": [],
         "players": Array.apply(null, new Array(10)).map(function()