From fed3c87fa6bc37186e4117f34b6a76c941dd5af3 Mon Sep 17 00:00:00 2001
From: David Huynh <dfhuynh@gmail.com>
Date: Mon, 26 Apr 2010 01:08:56 +0000
Subject: [PATCH] Added row flagging support. Fixed bug in row star change:
 starring or unstarring one row wasn't undo-able previously.

git-svn-id: http://google-refine.googlecode.com/svn/trunk@547 7d457c2a-affb-35e4-300a-418c747d4874
---
 LICENSE.txt                                   |   6 ++
 src/graphics/star-flag-map.psd                | Bin 34416 -> 39103 bytes
 .../commands/edit/AnnotateOneRowCommand.java  |  47 ++++++++-
 .../commands/edit/AnnotateRowsCommand.java    |   8 ++
 .../model/changes/RowFlagChange.java          |  69 ++++++++++++++
 .../model/changes/RowStarChange.java          |   7 +-
 .../operations/OperationRegistry.java         |   1 +
 .../operations/RowFlagOperation.java          |  90 ++++++++++++++++++
 src/main/webapp/about.html                    |   2 +-
 src/main/webapp/images/star-flag-map.png      | Bin 778 -> 1619 bytes
 .../webapp/scripts/views/data-table-view.js   |  60 +++++++++++-
 .../webapp/styles/views/data-table-view.css   |  12 ++-
 12 files changed, 289 insertions(+), 13 deletions(-)
 create mode 100644 src/main/java/com/metaweb/gridworks/model/changes/RowFlagChange.java
 create mode 100644 src/main/java/com/metaweb/gridworks/operations/RowFlagOperation.java

diff --git a/LICENSE.txt b/LICENSE.txt
index 826ed2544..b84cbde1d 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -106,3 +106,9 @@ licenses/icu4j.LICENSE.txt
    
 licenses/json.LICENSE.txt
     json
+
+Others
+------
+
+Flag icon
+    http://pixel-mixer.com/category/free-icons/
\ No newline at end of file
diff --git a/src/graphics/star-flag-map.psd b/src/graphics/star-flag-map.psd
index e40045d48ff41b4a774633e3b36338dfbaff4d8e..e4aac50367cb2208ee4ca21a110c59576243afa7 100644
GIT binary patch
delta 4400
zcmcIn3s@A_6}~%w5@98#`4UV`#F(@-sVz?>CN;(g0cG>0{qn}tRAV9_8c~S^b%+m;
z@Qf%BQsaZ=5gVm;Q6xS9UsRUYvMkGM*=1SYEDN*9va>sLduDhkB<1VZ&pY4Do&TIO
z=ia&hoVn)=#1lmqh-4Qc%>BZ%oy4P_OWnQRc3Zx}YxxRSx23MjQ|8+&n<kWOun7>j
z_<FwX^^&`%tNSu9_cgw5Zm+%MvD(MO$KA`<ceR_3tA|8t+f6+0>$=9>)7@ve*BaNC
ze0;pUmihR4yS?VS+ST1>nWvYh?<;@Y74&J!wK*Fk-u6$6UbgjK?Ju$=5ZC7LSN_6F
zUHMx(0oM>OS;|XhAp!J4$=C1v;3O3C3P(<1yC`MV<|hbSJIVW-tpwQ<T9Dh?@p4Z4
zCyg3`#jB~=A;W*?dXr~CZRGxg1(`!FlH>1gdZ8@8A%5_}`CX5d21K45Qukxzmronk
zGMPvAdCz}aI@r8NRh4ZX?vre*eda`*jQ)OU#JM{m3-rIw^%F+!OMREl_^@g_m7blr
zb@k!}r?$uJXl?jgX>v;PI&$cuP%63@ICqEF)uXCCCo2M^eVcAwE<919_~57P#v3=O
zm3DKY-`TXNkGK>0*I5}!2jbVd{Mq5i%Z=n;idq(axpw8@S1+pzpYt4iGY`v#T23=_
z)lt^d8<{uR?YU%Y&VJv#6Ey*8RZe-j>#sh?CMo_v|5kH$Bk6ZVqcG0#FBR_S$lp!v
zKkL8u?9tzml87y{1wzji?p`kAY)cY?RI}}$vPWosGqy;=c6?yB1fhBS5+k$-`bUv1
z#?Z?-nSkJy9j-u@fJiA0dqd!n@>KZKaP<yfByddmF#O{c#V(vFLaUw~?cvHf<WA1v
zqW|JhyYmf!r{slQLPFrldlZ7lE%xJ{B-LLC35jw~@+?vS6Pt@1$Bsvk6C95q`-#KB
zvF`%fa*sBdtsf!bBP_D1WOI#HY-4V*!~uGXW%XukL&4kHpjvEzd$vM=Y|$)g#AwC@
zwE<yd^WMN9YsP~9c`QOjCM*~cvuO6>0nCzAzud}VY-Nx`7RHITh^*{xOkK_(8~fAv
zju}}HQGs8jx&Co$JB?^W<l<cxWJZM1WN+pAz4)vZ^ma?U{kqu~8CV*z7zKYGad3CY
z4ipr`<FL<9UOyd^zC9>7gu_umdlG*9XIx@3xg{cmvxxd6H2T=N@4rfq+pwP#h{HB*
zPdIfxJ}x~p;`3lI2;CfXASpW|DlK{2A^wTrja%c7rICleCHF^gKDP#i?B5v@x;5tO
z$S*mMC}d;s_8=4-5)u;3<ItUHVopBU#9}cyiQo<d58#;v)1LTyCVYcj3k*bwDc_w*
zPfSJe@jQ+`R-*m)`I40QghasWcgLK#Bq!_sRd6}}R1#+qaVYlu)!Li6H}Vf=bArGF
zhmT$=RY>x096fbB0SscJ<FYQ77w47~9{Vwodm{F5Z2r}2S?6x#WS>j|92XrMot~7O
zoF~aV&FRtChvQ=7Q9@#3VgirjzWOwflTS1f=J}vxDxPLAO)%|=_X2H42XJ;q(ux{o
zjkE^cy$d2|=L<4}X-H33mz7BY&)-X4ucwAh{X<l_rkt}lSbVL=I81e047YWh!1;$;
zmDG@_f6yY=)Rck2m7Aqa6d2G$iXJKVM9Hn|2BSgSV{LC&l>;umQk1EXR#f&Hv}#Td
z2Dh)=MP*W{w2a5a*{hs6Ip0S4cZP}H-=<=i_=5)11k((jbcP=cv>D=?L=QQ@XNYg|
zVF&mO@l8JL0KcEsp9yDjrilN41AK<~CLeZy&k(KL_dhLurwXQG^gjgn4Dn4q>;UKa
zpBkN$_)lZs$E4&J1k((-08iOWzO~Q=xu9pq4(|RLen+1RyE=C~p7MUw;xU^=yw%Uy
zJn^$OPGdgq_p<;wqbK?EF&JseSdxsWcLk*5KZ@~<@Vzm6LZ#S5GuW}C59{mdo9g5S
z%rGo=yeK~N1-~7K?cI7F^xe9)I&E)TlSWZ5?_{x18x?$DbbH<su@eMN!woeJs*cWP
zl}e^mj9@$$AO9qLe7`1-uq>XduC8lTcW4_l&16-56KBFid=@^wg?~{BCah9cr_y#d
zH*4g|x_*qYuwvVeiA{a?Js5eQwzff~Yi-b|<c$i*OB|CXclmv%7;LYqmN%<4^^F>~
z9%(_}8x}%-xjT9r?D~5{;8o0u8nRxgXp}cKE0r}2b~w2)IFG>>WA;SlsIAyRTU`S$
z)ZJ9q(0-4>Hgrzf<srzJbebMBwqW9txZ8+{ZrupYp^>a}fEZl|jcH8W6xRXL>x>o*
zc~x$X6;Qj5wQ@)<z5$5R>8;rE7`Ce`Ey&7L3}ZWEKdddqNSqG52fTcifMsbXvNDny
zu-O8Wm8tNcMyqR888HKE=oq;^?^`}aNc}FU1oX;^PEFr%e`lY%Rn-TpQyv~8z9b+0
zqa4=*F9V9Ewr<MU)!oyqRnxGbIQdZWL=KU~;JK>Cmd;*E->&a!By~ED7R!+%Y2!bg
z3<XC^Q<J8<pX%z;w`f}_juvIYHxqeAstE=*s#<hC1AXm%J?aiM_XXulCLU)BV5Yjp
zrmo&zU58$$YwHHRAt5&UL~7<YkcgZ~06nd0Y9zJlwwBJWwl)>eA~_s)jlp-s>EB=N
z09v{ln|m?t*J-r9CZNTV_h}SIOQ)=!rzJ9wTY6=Mk*9_FXe%H~rJScFB`_aQOGOt?
z%chTMK-E>FwB!XI1=Ly50<_?H94(vIkI^El09p<od<SS*vH|y0$?N6i21tWpvPD(c
zJU|(#0UEO$Eo<hN%lWKDCX=>-zO>Ll(TtU51_uqpusQ|%u0u*Pn#5Frz^Pl=J7lpk
zwAC^&JYeN$NiQy$NNehV7ENED*<!Vfu(X~u897?$b9bu86P?;#poQsxqz9Z>SV(uw
z94%d?WfQ4Sr3D5a={LYQmJ!BEnFqL;$|iH6mKK=lpuU&3(8FfdWV#38<v3hal&P$&
ztKxE_GSFN5`r1h205xEyhwmAH7Uiwm4J>X~RLM0^V>lS~`XP)>)F3qs->VH%x+(zH
zv;X#8o)sVGJAg_H`*~LMzjg&g|5VJg@|klgAX%ZBXJzri5kS|jFnq8iId2A}DwJ`o
z*gXoYyg0vhG+2rXffe&1E?6EYdl+Q<h8J46mR)BXumIWGJXi)nv9eO+;cpe$tb0A+
zg^8j_KrMlLXOYOyEVA);oG6e8D3Dl0tP=T+h=`R?YLC@Q0%`-;6aMS`%_5TUe|k#c
zL_Fo^KOz$N*-g|?Q0lBOi3IE1$BL=RTx+(2pGf5Iw<>@Y;eaWnl@&R-i$pI9&~H}y
zu3kECtkN2Sk=;bEj2B#Q8xgTm^sDi@3(%|ppYiGokcVjTcnt=~e;qMii2-_E<Z)j;
PHjL~X=RM&o5;EvN62<T#

delta 604
zcmdnLk?BJZ(*y;kLbr`d&zS^_bd8Kcj0~+zjI4}Ibqy>gOEQ~b2yTvN_F?2OaB?v-
zwRAO_9M7V#`7+BxCRGDBCnra9Qwsw#OCuu-V@nHjBWFiv10!=sV*_V5Gglk^lFYQp
zd%5B_TX4wwnlf29dHS+2F@OLYm}CHp7=YQ#jEsyBzAl*0#=r=qxi?P;UCFP?4OYkl
zl3=z55+Er>C{AHu;CTWRm){(h`iDvNYse%|RZW#io?f0RlY;+W{2DU-)Jm1*ua+QF
zn^QB{8F_(zHd26jesg8kU3LyW6$S?0AOHVujw^~}-TbkJhiUWo+6iov&3pXhnHccG
w$r`=N1l2t2A*_Z7b2ex7hB3-N_>UKE_MZ?=Sdq!(P{NADriC*qJYc{N0RlF~eE<Le

diff --git a/src/main/java/com/metaweb/gridworks/commands/edit/AnnotateOneRowCommand.java b/src/main/java/com/metaweb/gridworks/commands/edit/AnnotateOneRowCommand.java
index a101f612b..8b4028408 100644
--- a/src/main/java/com/metaweb/gridworks/commands/edit/AnnotateOneRowCommand.java
+++ b/src/main/java/com/metaweb/gridworks/commands/edit/AnnotateOneRowCommand.java
@@ -38,9 +38,27 @@ public class AnnotateOneRowCommand extends Command {
                 );
                 
                 performProcessAndRespond(request, response, project, process);
-            } else {
-                respond(response, "{ \"code\" : \"error\", \"message\" : \"invalid command parameters\" }");
+                return;
             }
+
+            String flaggedString = request.getParameter("flagged");
+            if (flaggedString != null) {
+                boolean flagged = "true".endsWith(flaggedString);
+                String description = (flagged ? "Flag row " : "Unflag row ") + (rowIndex + 1); 
+
+                FlagOneRowProcess process = new FlagOneRowProcess(
+                    project, 
+                    description,
+                    rowIndex, 
+                    flagged
+                );
+                
+                performProcessAndRespond(request, response, project, process);
+                return;
+            }
+
+            respond(response, "{ \"code\" : \"error\", \"message\" : \"invalid command parameters\" }");
+            
         } catch (Exception e) {
             respondException(response, e);
         }
@@ -71,4 +89,29 @@ public class AnnotateOneRowCommand extends Command {
             );
         }
     }
+    protected static class FlagOneRowProcess extends QuickHistoryEntryProcess {
+        final int rowIndex;
+        final boolean flagged;
+        
+        FlagOneRowProcess(
+            Project project, 
+            String briefDescription, 
+            int rowIndex, 
+            boolean flagged
+        ) {
+            super(project, briefDescription);
+            
+            this.rowIndex = rowIndex;
+            this.flagged = flagged;
+        }
+
+        protected HistoryEntry createHistoryEntry() throws Exception {
+            return new HistoryEntry(
+                _project, 
+                (flagged ? "Flag row " : "Unflag row ") + (rowIndex + 1), 
+                null, 
+                new RowStarChange(rowIndex, flagged)
+            );
+        }
+    }
 }
diff --git a/src/main/java/com/metaweb/gridworks/commands/edit/AnnotateRowsCommand.java b/src/main/java/com/metaweb/gridworks/commands/edit/AnnotateRowsCommand.java
index c1d747b8e..165ea10d4 100644
--- a/src/main/java/com/metaweb/gridworks/commands/edit/AnnotateRowsCommand.java
+++ b/src/main/java/com/metaweb/gridworks/commands/edit/AnnotateRowsCommand.java
@@ -7,6 +7,7 @@ import org.json.JSONObject;
 import com.metaweb.gridworks.commands.EngineDependentCommand;
 import com.metaweb.gridworks.model.AbstractOperation;
 import com.metaweb.gridworks.model.Project;
+import com.metaweb.gridworks.operations.RowFlagOperation;
 import com.metaweb.gridworks.operations.RowStarOperation;
 
 public class AnnotateRowsCommand extends EngineDependentCommand {
@@ -21,6 +22,13 @@ public class AnnotateRowsCommand extends EngineDependentCommand {
             
             return new RowStarOperation(engineConfig, starred);
         }
+        
+        String flaggedString = request.getParameter("flagged");
+        if (flaggedString != null) {
+            boolean flagged = "true".endsWith(flaggedString);
+            
+            return new RowFlagOperation(engineConfig, flagged);
+        }
         return null;
     }
 }
diff --git a/src/main/java/com/metaweb/gridworks/model/changes/RowFlagChange.java b/src/main/java/com/metaweb/gridworks/model/changes/RowFlagChange.java
new file mode 100644
index 000000000..96859262d
--- /dev/null
+++ b/src/main/java/com/metaweb/gridworks/model/changes/RowFlagChange.java
@@ -0,0 +1,69 @@
+package com.metaweb.gridworks.model.changes;
+
+import java.io.IOException;
+import java.io.LineNumberReader;
+import java.io.Writer;
+import java.util.Properties;
+
+import com.metaweb.gridworks.history.Change;
+import com.metaweb.gridworks.model.Project;
+import com.metaweb.gridworks.model.Row;
+import com.metaweb.gridworks.util.Pool;
+
+public class RowFlagChange implements Change {
+    final int rowIndex;
+    final boolean newFlagged;
+    Boolean oldFlagged = null;
+    
+    public RowFlagChange(int rowIndex, boolean newFlagged) {
+        this.rowIndex = rowIndex;
+        this.newFlagged = newFlagged;
+    }
+
+    public void apply(Project project) {
+        Row row = project.rows.get(rowIndex);
+        if (oldFlagged == null) {
+            oldFlagged = row.flagged;
+        }
+        row.flagged = newFlagged;
+    }
+
+    public void revert(Project project) {
+        Row row = project.rows.get(rowIndex);
+        
+        row.flagged = oldFlagged;
+    }
+    
+    public void save(Writer writer, Properties options) throws IOException {
+        writer.write("row="); writer.write(Integer.toString(rowIndex)); writer.write('\n');
+        writer.write("newFlagged="); writer.write(Boolean.toString(newFlagged)); writer.write('\n');
+        writer.write("oldFlagged="); writer.write(Boolean.toString(oldFlagged)); writer.write('\n');
+        writer.write("/ec/\n"); // end of change marker
+    }
+    
+    static public RowFlagChange load(LineNumberReader reader, Pool pool) throws Exception {
+        int row = -1;
+        boolean oldStarred = false;
+        boolean newStarred = false;
+        
+        String line;
+        while ((line = reader.readLine()) != null && !"/ec/".equals(line)) {
+            int equal = line.indexOf('=');
+            CharSequence field = line.subSequence(0, equal);
+            String value = line.substring(equal + 1);
+            
+            if ("row".equals(field)) {
+                row = Integer.parseInt(value);
+            } else if ("oldFlagged".equals(field)) {
+                oldStarred = Boolean.parseBoolean(value);
+            } else if ("newFlagged".equals(field)) {
+                oldStarred = Boolean.parseBoolean(value);
+            }
+        }
+        
+        RowFlagChange change = new RowFlagChange(row, newStarred);
+        change.oldFlagged = oldStarred;
+        
+        return change;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/metaweb/gridworks/model/changes/RowStarChange.java b/src/main/java/com/metaweb/gridworks/model/changes/RowStarChange.java
index ef50654ac..b2d840456 100644
--- a/src/main/java/com/metaweb/gridworks/model/changes/RowStarChange.java
+++ b/src/main/java/com/metaweb/gridworks/model/changes/RowStarChange.java
@@ -13,7 +13,7 @@ import com.metaweb.gridworks.util.Pool;
 public class RowStarChange implements Change {
     final int rowIndex;
     final boolean newStarred;
-    boolean oldStarred;
+    Boolean oldStarred = null;
     
     public RowStarChange(int rowIndex, boolean newStarred) {
         this.rowIndex = rowIndex;
@@ -22,8 +22,9 @@ public class RowStarChange implements Change {
 
     public void apply(Project project) {
         Row row = project.rows.get(rowIndex);
-        
-        oldStarred = row.starred;
+        if (oldStarred == null) {
+            oldStarred = row.starred;
+        }
         row.starred = newStarred;
     }
 
diff --git a/src/main/java/com/metaweb/gridworks/operations/OperationRegistry.java b/src/main/java/com/metaweb/gridworks/operations/OperationRegistry.java
index 25f260c93..90d53cff7 100644
--- a/src/main/java/com/metaweb/gridworks/operations/OperationRegistry.java
+++ b/src/main/java/com/metaweb/gridworks/operations/OperationRegistry.java
@@ -38,6 +38,7 @@ public abstract class OperationRegistry {
         
         register("row-removal", RowRemovalOperation.class);
         register("row-star", RowStarOperation.class);
+        register("row-flag", RowFlagOperation.class);
         
         register("save-protograph", SaveProtographOperation.class);
         register("text-transform", TextTransformOperation.class);
diff --git a/src/main/java/com/metaweb/gridworks/operations/RowFlagOperation.java b/src/main/java/com/metaweb/gridworks/operations/RowFlagOperation.java
new file mode 100644
index 000000000..9a05b7a50
--- /dev/null
+++ b/src/main/java/com/metaweb/gridworks/operations/RowFlagOperation.java
@@ -0,0 +1,90 @@
+package com.metaweb.gridworks.operations;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.json.JSONWriter;
+
+import com.metaweb.gridworks.browsing.Engine;
+import com.metaweb.gridworks.browsing.FilteredRows;
+import com.metaweb.gridworks.browsing.RowVisitor;
+import com.metaweb.gridworks.history.Change;
+import com.metaweb.gridworks.history.HistoryEntry;
+import com.metaweb.gridworks.model.AbstractOperation;
+import com.metaweb.gridworks.model.Project;
+import com.metaweb.gridworks.model.Row;
+import com.metaweb.gridworks.model.changes.MassChange;
+import com.metaweb.gridworks.model.changes.RowFlagChange;
+
+public class RowFlagOperation extends EngineDependentOperation {
+    final protected boolean _flagged;
+
+    static public AbstractOperation reconstruct(Project project, JSONObject obj) throws Exception {
+        JSONObject engineConfig = obj.getJSONObject("engineConfig");
+        boolean flagged = obj.getBoolean("flagged");
+        
+        return new RowFlagOperation(
+            engineConfig, 
+            flagged
+        );
+    }
+    
+    public RowFlagOperation(JSONObject engineConfig, boolean flagged) {
+        super(engineConfig);
+        _flagged = flagged;
+    }
+
+    public void write(JSONWriter writer, Properties options)
+            throws JSONException {
+        
+        writer.object();
+        writer.key("op"); writer.value(OperationRegistry.s_opClassToName.get(this.getClass()));
+        writer.key("description"); writer.value(getBriefDescription(null));
+        writer.key("engineConfig"); writer.value(getEngineConfig());
+        writer.key("flagged"); writer.value(_flagged);
+        writer.endObject();
+    }
+
+    protected String getBriefDescription(Project project) {
+        return (_flagged ? "Flag rows" : "Unflag rows");
+    }
+
+   protected HistoryEntry createHistoryEntry(Project project) throws Exception {
+        Engine engine = createEngine(project);
+        
+        List<Change> changes = new ArrayList<Change>(project.rows.size());
+        
+        FilteredRows filteredRows = engine.getAllFilteredRows(false);
+        filteredRows.accept(project, createRowVisitor(project, changes));
+        
+        return new HistoryEntry(
+            project, 
+            (_flagged ? "Flag" : "Unflag") + " " + changes.size() + " rows", 
+            this, 
+            new MassChange(changes, false)
+        );
+    }
+
+    protected RowVisitor createRowVisitor(Project project, List<Change> changes) throws Exception {
+        return new RowVisitor() {
+            List<Change> changes;
+            
+            public RowVisitor init(List<Change> changes) {
+                this.changes = changes;
+                return this;
+            }
+            
+            public boolean visit(Project project, int rowIndex, Row row, boolean includeContextual, boolean includeDependent) {
+                if (row.starred != _flagged) {
+                    RowFlagChange change = new RowFlagChange(rowIndex, _flagged);
+                    
+                    changes.add(change);
+                }
+                return false;
+            }
+        }.init(changes);
+    }
+}
diff --git a/src/main/webapp/about.html b/src/main/webapp/about.html
index 70fb668e9..d0aa096bc 100644
--- a/src/main/webapp/about.html
+++ b/src/main/webapp/about.html
@@ -1 +1 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
    <title>About Freebase Gridworks</title>
    <link rel="stylesheet" href="/styles/common.css" />
    <link rel="stylesheet" href="/styles/index.css" />
    <script type="text/javascript" src="scripts/version.js"></script>
    <script type="text/javascript" src="externals/jquery-1.4.2.min.js"></script>
    <script>
      $(function() {
          if (GridworksVersion && GridworksVersion.version) {
              if (GridworksVersion.version != "$VERSION") {
                  $("#version").text("Version " + GridworksVersion.version + " [" + GridworksVersion.revision + "]").show();
              }
          }
      });
    </script>
    <style>
        #body {
            margin: 0em;
            padding: 40px;
        }
        h1 {
          font-family: helvetica;
          font-weight: normal;
          letter-spacing: -0.04em;
        }
		h1 + h2 {
		  font-family: myriad pro, tahoma;
		  font-weight: normal;
		  position: relative;
		  bottom: 1em;
		  letter-spacing: 0.3em;
		  font-size: 130%;
		  margin: 0em;
		  padding: 0em;
		  color: #888;
		}        
        #about p {
            width: 40em;
        }
        .license {
            font-family: monospace;
            font-size: 12px;
            white-space: pre;
            border: 1px solid #ddd;
            background: #eee;
            padding: 20px;
            width: 60em;
        }
        h2 {
            margin-top: 2em;
            color: #888;
        }
        ul.credit-entries {
            margin: 0;
            padding: 0;
        }
        ul.credit-entries li {
            display: block;
            margin: 1em 0;
        }
    </style>
</head>
<body>
    <div id="header">
      <a id="logo" href="http://www.freebase.com/" title="Freebase"><img alt="Freebase" src="images/freebase-headerlogo.png" /></a>
      <div id="path"><span class="app-path-section"><a href="./index.html">Gridworks</a></span></div>
    </div>

    <div id="body">
        <h1>About Free<b>base</b> Grid<b>works</b></h1>
        <h2 id="version" style="display: none"></h2>
        
        <div id="about">
            
            <p>
                Freebase Gridworks is a power tool that allows you to load data, 
  understand it, clean it up, reconcile it internally, and augment it 
  with data coming from Freebase. All with the comfort and privacy of 
  your own computer.</p>
  
            <p>
                It was originally developed by <a href="http://www.metaweb.com/">Metaweb Technologies, Inc.</a>
            </p>
            
            <h2>License</h2>
            
<pre class="license">/*
 * Copyright (c) 2010, Metaweb Technologies, Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 *  1. Redistributions of source code must retain the above copyright
 *     notice, this list of conditions and the following disclaimer.
 *
 *  2. Redistributions in binary form must reproduce the above
 *     copyright notice, this list of conditions and the following
 *     disclaimer in the documentation and/or other materials provided
 *     with the distribution.
 * 
 * THIS SOFTWARE IS PROVIDED BY METAWEB TECHNOLOGIES AND CONTRIBUTORS
 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
 * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL METAWEB
 * TECHNOLOGIES OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
 * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
 */</pre>
 
 <h2>Dependencies Licenses</h2>

<pre class="license">licenses/apache2.0.LICENSE.txt
    ant (package org.apache.tools.tar)
    bzip2 (package org.apache.tools.bzip2)
    calendar-parser (package com.metaweb.gridworks.expr.util)
    commons-lang
    commons-codec
    jackson
    jdatapath
    jetty
    jetty-util
    log4j
    poi
    poi-ooxml
    poi-ooxml-schemas
    servlet-api
    xmlbeans
 
licenses/secondstring.LICENSE.txt (BSD family)
    secondstring

licenses/dom4j.LICENSE.txt (BSD family)
    dom4j
    
licenses/simile.LICENSE.txt (BSD family)
    vicino (package edu.mit.simile.vicino)

licenses/arithcode.LICENSE.txt (BSD family)
    arithcode
       
licenses/icu4j.LICENSE.txt (MIT family)
    icu4j
   
licenses/slf4j.LICENSE.txt (MIT family)
    slf4j-api
    slf4j-log4j12
    jcl-over-slf4j

licenses/json.LICENSE.txt (MIT family)    
    json
    
licenses/cos.LICENSE.txt
    cos</pre>
        
            <h2>Credits</h2>
            <ul class="credit-entries">
                <li><a href="http://www.freebase.com/view/en/david_francois_huynh">David Huynh</a>, Metaweb Technologies, Inc.</li>
                <li><a href="http://www.freebase.com/view/en/stefano_mazzocchi">Stefano Mazzocchi</a>, Metaweb Technologies, Inc.</li>
                <li><a href="http://www.freebase.com/view/en/vishal_talwar">Vishal Talwar</a>, Metaweb Technologies, Inc.</li>
                <li><a href="http://www.freebase.com/view/en/will_moffat">Will Moffat</a>, Metaweb Technologies, Inc.</li>
                <li><a href="http://www.freebase.com/view/en/jeff_fry">Jeff Fry</a>, Metaweb Technologies, Inc.</li>
                <li><a href="http://www.freebase.com/view/en/james_home">James Home</a>, Metaweb Technologies, Inc.</li>
            </ul>

            <h2>Special Thanks</h2>
            <ul class="credit-entries">
                <li><a href="http://www.paolociccarese.info/">Paolo Ciccarese</a></li>
            </ul>
        </div>
    </div>

    <div id="footer">
        <a href="about.html">About Freebase Gridworks</a>
        &bull; 
        &copy; 2010 <a href="http://www.metaweb.com/">Metaweb Technologies, Inc.</a>
    </div>
</body>
</html>
\ No newline at end of file
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
    <title>About Freebase Gridworks</title>
    <link rel="stylesheet" href="/styles/common.css" />
    <link rel="stylesheet" href="/styles/index.css" />
    <script type="text/javascript" src="scripts/version.js"></script>
    <script type="text/javascript" src="externals/jquery-1.4.2.min.js"></script>
    <script>
      $(function() {
          if (GridworksVersion && GridworksVersion.version) {
              if (GridworksVersion.version != "$VERSION") {
                  $("#version").text("Version " + GridworksVersion.version + " [" + GridworksVersion.revision + "]").show();
              }
          }
      });
    </script>
    <style>
        #body {
            margin: 0em;
            padding: 40px;
        }
        h1 {
          font-family: helvetica;
          font-weight: normal;
          letter-spacing: -0.04em;
        }
		h1 + h2 {
		  font-family: myriad pro, tahoma;
		  font-weight: normal;
		  position: relative;
		  bottom: 1em;
		  letter-spacing: 0.3em;
		  font-size: 130%;
		  margin: 0em;
		  padding: 0em;
		  color: #888;
		}        
        #about p {
            width: 40em;
        }
        .license {
            font-family: monospace;
            font-size: 12px;
            white-space: pre;
            border: 1px solid #ddd;
            background: #eee;
            padding: 20px;
            width: 60em;
        }
        h2 {
            margin-top: 2em;
            color: #888;
        }
        ul.credit-entries {
            margin: 0;
            padding: 0;
        }
        ul.credit-entries li {
            display: block;
            margin: 1em 0;
        }
    </style>
</head>
<body>
    <div id="header">
      <a id="logo" href="http://www.freebase.com/" title="Freebase"><img alt="Freebase" src="images/freebase-headerlogo.png" /></a>
      <div id="path"><span class="app-path-section"><a href="./index.html">Gridworks</a></span></div>
    </div>

    <div id="body">
        <h1>About Free<b>base</b> Grid<b>works</b></h1>
        <h2 id="version" style="display: none"></h2>
        
        <div id="about">
            
            <p>
                Freebase Gridworks is a power tool that allows you to load data, 
  understand it, clean it up, reconcile it internally, and augment it 
  with data coming from Freebase. All with the comfort and privacy of 
  your own computer.</p>
  
            <p>
                It was originally developed by <a href="http://www.metaweb.com/">Metaweb Technologies, Inc.</a>
            </p>
            
            <h2>License</h2>
            
<pre class="license">/*
 * Copyright (c) 2010, Metaweb Technologies, Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 *  1. Redistributions of source code must retain the above copyright
 *     notice, this list of conditions and the following disclaimer.
 *
 *  2. Redistributions in binary form must reproduce the above
 *     copyright notice, this list of conditions and the following
 *     disclaimer in the documentation and/or other materials provided
 *     with the distribution.
 * 
 * THIS SOFTWARE IS PROVIDED BY METAWEB TECHNOLOGIES AND CONTRIBUTORS
 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
 * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL METAWEB
 * TECHNOLOGIES OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
 * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
 */</pre>
 
 <h2>Dependencies Licenses</h2>

<pre class="license">licenses/apache2.0.LICENSE.txt
    ant (package org.apache.tools.tar)
    bzip2 (package org.apache.tools.bzip2)
    calendar-parser (package com.metaweb.gridworks.expr.util)
    commons-lang
    commons-codec
    jackson
    jdatapath
    jetty
    jetty-util
    log4j
    poi
    poi-ooxml
    poi-ooxml-schemas
    servlet-api
    xmlbeans
 
licenses/secondstring.LICENSE.txt (BSD family)
    secondstring

licenses/dom4j.LICENSE.txt (BSD family)
    dom4j
    
licenses/simile.LICENSE.txt (BSD family)
    vicino (package edu.mit.simile.vicino)

licenses/arithcode.LICENSE.txt (BSD family)
    arithcode
       
licenses/icu4j.LICENSE.txt (MIT family)
    icu4j
   
licenses/slf4j.LICENSE.txt (MIT family)
    slf4j-api
    slf4j-log4j12
    jcl-over-slf4j

licenses/json.LICENSE.txt (MIT family)    
    json
    
licenses/cos.LICENSE.txt
    cos
    
Flag icon, free for commercial reuse
    http://pixel-mixer.com/category/free-icons/</pre>
        
            <h2>Credits</h2>
            <ul class="credit-entries">
                <li><a href="http://www.freebase.com/view/en/david_francois_huynh">David Huynh</a>, Metaweb Technologies, Inc.</li>
                <li><a href="http://www.freebase.com/view/en/stefano_mazzocchi">Stefano Mazzocchi</a>, Metaweb Technologies, Inc.</li>
                <li><a href="http://www.freebase.com/view/en/vishal_talwar">Vishal Talwar</a>, Metaweb Technologies, Inc.</li>
                <li><a href="http://www.freebase.com/view/en/will_moffat">Will Moffat</a>, Metaweb Technologies, Inc.</li>
                <li><a href="http://www.freebase.com/view/en/jeff_fry">Jeff Fry</a>, Metaweb Technologies, Inc.</li>
                <li><a href="http://www.freebase.com/view/en/james_home">James Home</a>, Metaweb Technologies, Inc.</li>
            </ul>

            <h2>Special Thanks</h2>
            <ul class="credit-entries">
                <li><a href="http://www.paolociccarese.info/">Paolo Ciccarese</a></li>
            </ul>
        </div>
    </div>

    <div id="footer">
        <a href="about.html">About Freebase Gridworks</a>
        &bull; 
        &copy; 2010 <a href="http://www.metaweb.com/">Metaweb Technologies, Inc.</a>
    </div>
</body>
</html>
\ No newline at end of file
diff --git a/src/main/webapp/images/star-flag-map.png b/src/main/webapp/images/star-flag-map.png
index d6af94d2f814fe78d00f80813378002f776d3eae..eeb18d212738945e36e6d8fa264fc10cbe69f743 100644
GIT binary patch
delta 1566
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
Qy8r+H07*qoM6N<$f;Ttj>i_@%

delta 718
zcmV;<0x|v542lMjNPhyXNkl<Zc-rihPiPZC6vlTqU1K&jwWdviO$v!sizb*-3Q3hJ
znqmb@4z`yXL@~vShuDh;kAmK6y$FKhrB^{wL})xjL<L1FsNf%3s1>wUXo88B)W+}W
zEDYQ1ZV3n?``|G%J2SuecJ{ruf?#YRxW{NgrBX3L2nyUT)PHE9?%n>}*6r?lMnX(P
zC}4Dh5jPSd836XChQon@RJ#}bc#SX81cn0)63|$Sh<Hz;)!RR?IY5GH6wwHV9SjEv
z(pyx=S|>cg+TVt2Y-{!^3S7W-hTpvUI>hZO!n3SZ%?58~t;%p>zl|~K!D!*u|Ac>`
zR-}WQJj(SGr++&9t_HiTuIP;U+>s8CoBEILfBXbML7gk)7t5C~JfEGPD;+{i6h%?A
zfzbuVS}-JzA%n4oF&4pC;uy<d`~c&L$OYlG(JP5)ux-7|=zgc)FBC@7*~y2w*<%<^
zQD8!Z8iY|W8o;PCVJv}>2V)Y$lE}^V;cYTwS9`bh9)Ao5s%@UQJ^dkbeBw3Kk70OM
z%?>7l%mYRUjCEi*bQs^k_y)!lhI8~x)U4S8AH0zpJQ?q4@o5F5`frY+dk6lOPf<>U
z8ebd12!dhP3IKx+|IEjeHaiF&+0pqY7I=$xdFfe%7ocMVcYz^SVNiV3YXW+Oh}hwD
zc$4Ck<$qGKTpk(DK0SN-!3*kBrclPPDr%UPU?^Zn*tZPE0vHAAQ>IYHuqvu+neki6
zne4Nnd3;;?=10h>YCe8<G=FKlkFGLpQZYkdB*54YMhs&=IaN(C4uG)_<5nXP$usA7
zzC?QtzKai9_(e9CG!fy$x;<#y;TyQ;RQkhg&PQh?LS~1^tDUPNLSlzVIu&}woVbd=
z;9oaM_y^1qVTrIrSRyPDmIzCPCE~vj@k@XK0JW0w;c;TI-~a#s07*qoM6N<$f_`UD
A0ssI2

diff --git a/src/main/webapp/scripts/views/data-table-view.js b/src/main/webapp/scripts/views/data-table-view.js
index 6980f55e9..0bc3c03fd 100644
--- a/src/main/webapp/scripts/views/data-table-view.js
+++ b/src/main/webapp/scripts/views/data-table-view.js
@@ -122,7 +122,8 @@ DataTableView.prototype._renderDataTable = function(table) {
         if (keys.length > 0) {
             var tr = table.insertRow(table.rows.length);
             tr.insertCell(0); // star
-            tr.insertCell(1); // row index
+            tr.insertCell(1); // flag
+            tr.insertCell(2); // row index
             
             for (var c = 0; c < columns.length; c++) {
                 var td = tr.insertCell(tr.cells.length);
@@ -143,7 +144,8 @@ DataTableView.prototype._renderDataTable = function(table) {
         if (groups.length > 0) {
             var tr = table.insertRow(table.rows.length);
             tr.insertCell(0); // star
-            tr.insertCell(1); // row index
+            tr.insertCell(1); // flag
+            tr.insertCell(2); // row index
             
             for (var c = 0; c < columns.length; c++) {
                 var foundGroup = false;
@@ -197,7 +199,7 @@ DataTableView.prototype._renderDataTable = function(table) {
     var trHead = table.insertRow(table.rows.length);
     DOM.bind(
         $(trHead.insertCell(trHead.cells.length))
-            .attr("colspan", "2")
+            .attr("colspan", "3")
             .addClass("column-header")
             .html(
                 '<table class="column-header-layout"><tr>' +
@@ -260,6 +262,27 @@ DataTableView.prototype._renderDataTable = function(table) {
                     "json"
                 );
             });
+
+        var tdFlag = tr.insertCell(tr.cells.length);
+        var flag = $('<a href="javascript:{}">&nbsp;</a>')
+            .addClass(row.flagged ? "data-table-flag-on" : "data-table-flag-off")
+            .appendTo(tdFlag)
+            .click(function() {
+                var newFlagged = !row.flagged;
+
+                Gridworks.postProcess(
+                    "annotate-one-row",
+                    { row: row.i, flagged: newFlagged },
+                    null,
+                    {},
+                    {   onDone: function(o) {
+                            row.flagged = newFlagged;
+                            renderRow(tr, r, row, even);
+                        }
+                    },
+                    "json"
+                );
+            });
         
         var tdIndex = tr.insertCell(tr.cells.length);
         if ("j" in row) {
@@ -345,6 +368,22 @@ DataTableView.prototype._createMenuForAllColumns = function(elmt) {
                             }
                         );
                     }
+                },
+                {
+                    label: "Facet by Flag",
+                    click: function() {
+                        ui.browsingEngine.addFacet(
+                            "list", 
+                            {
+                                "name" : "Flagged Rows",
+                                "columnName" : "", 
+                                "expression" : "row.flagged"
+                            },
+                            {
+                                "scroll" : false
+                            }
+                        );
+                    }
                 }
             ]
         },
@@ -364,7 +403,20 @@ DataTableView.prototype._createMenuForAllColumns = function(elmt) {
                 },
                 {},
                 {
-                    label: "Remove Matching Rows",
+                    label: "Flag Rows",
+                    click: function() {
+                        Gridworks.postProcess("annotate-rows", { "flagged" : "true" }, null, { rowMetadataChanged: true });
+                    }
+                },
+                {
+                    label: "Unflag Rows",
+                    click: function() {
+                        Gridworks.postProcess("annotate-rows", { "flagged" : "false" }, null, { rowMetadataChanged: true });
+                    }
+                },
+                {},
+                {
+                    label: "Remove All Matching Rows",
                     click: function() {
                         Gridworks.postProcess("remove-rows", {}, null, { rowMetadataChanged: true });
                     }
diff --git a/src/main/webapp/styles/views/data-table-view.css b/src/main/webapp/styles/views/data-table-view.css
index 9eaa4c652..30c3fc7ab 100644
--- a/src/main/webapp/styles/views/data-table-view.css
+++ b/src/main/webapp/styles/views/data-table-view.css
@@ -200,7 +200,7 @@ a.data-table-recon-match-similar:hover {
     background-position: 0px -17px;
 }
 
-a.data-table-star-on, a.data-table-star-off {
+a.data-table-star-on, a.data-table-star-off, a.data-table-flag-on, a.data-table-flag-off {
     display: block;
     width: 16px;
     height: 16px;
@@ -208,12 +208,18 @@ a.data-table-star-on, a.data-table-star-off {
     background-repeat: no-repeat;
     text-decoration: none;
 }
-a.data-table-star-on {
+a.data-table-star-on, a.data-table-star-off:hover {
     background-position: 0px 0px;
 }
-a.data-table-star-off {
+a.data-table-star-off, a.data-table-star-on:hover {
     background-position: -17px 0px;
 }
+a.data-table-flag-on, a.data-table-flag-off:hover {
+    background-position: 0px -17px;
+}
+a.data-table-flag-off, a.data-table-flag-on:hover {
+    background-position: -17px -17px;
+}
 
 .data-table-cell-editor {
     border: 1px solid #ccc;