[open-ils-commits] r16061 - in trunk/Open-ILS/src: . extras (miker)

[svn at svn.open-ils.org]

Author: miker
Date: 2010-03-30 13:05:22 -0400 (Tue, 30 Mar 2010)
New Revision: 16061

Modified:
   trunk/Open-ILS/src/Makefile.am
   trunk/Open-ILS/src/extras/autogen.sh
   trunk/Open-ILS/src/extras/facet_types_js.pl
Log:
add makefile and autogen support for the facet definition bits; more minor bug fixing of facet definition JS generator

Modified: trunk/Open-ILS/src/Makefile.am
===================================================================
--- trunk/Open-ILS/src/Makefile.am	2010-03-30 16:41:18 UTC (rev 16060)
+++ trunk/Open-ILS/src/Makefile.am	2010-03-30 17:05:22 UTC (rev 16061)
@@ -38,6 +38,7 @@
  	 @srcdir@/extras/locale_html_options.pl \
  	 @srcdir@/extras/org_tree_js.pl \
 	 @srcdir@/extras/org_lasso_js.pl \
+	 @srcdir@/extras/facet_types_js.pl \
 	 @srcdir@/extras/org_tree_html_options.pl \
 	 @srcdir@/extras/org_tree_proximity.pl \
 	 @srcdir@/extras/autogen.sh \

Modified: trunk/Open-ILS/src/extras/autogen.sh
===================================================================
--- trunk/Open-ILS/src/extras/autogen.sh	2010-03-30 16:41:18 UTC (rev 16060)
+++ trunk/Open-ILS/src/extras/autogen.sh	2010-03-30 17:05:22 UTC (rev 16061)
@@ -113,6 +113,10 @@
 perl org_lasso_js.pl "$CONFIG" > "$JSDIR/OrgLasso.js";
 cp "$JSDIR/OrgLasso.js" "$FMDOJODIR/"
 
+echo "Updating Facet Definitions";
+perl facet_types_js.pl "$CONFIG" "$JSDIR" "FacetDefs.js";
+cp "$JSDIR/en-US/FacetDefs.js" "$FMDOJODIR/"
+
 if [ ! -z "$PROXIMITY" ]
 then
 	echo "Refreshing proximity of org units";

Modified: trunk/Open-ILS/src/extras/facet_types_js.pl
===================================================================
--- trunk/Open-ILS/src/extras/facet_types_js.pl	2010-03-30 16:41:18 UTC (rev 16060)
+++ trunk/Open-ILS/src/extras/facet_types_js.pl	2010-03-30 17:05:22 UTC (rev 16061)
@@ -77,12 +77,12 @@
         my %hash = (
             id          => $o->id,
             name        => val($o->name),
-            label       => $o->val($o->label),
+            label       => val($o->label),
             classname   => val($o->field_class->name),
             classlabel  => val($o->field_class->label)
         );
 
-        $pile .= $hash{id}.':{'.join(',', map { "$_:$hash{$_}" } keys %hash).'",';
+        $pile .= $hash{id}.':{'.join(',', map { "$_:$hash{$_}" } keys %hash).'},';
     }
 
     $pile =~ s/,$//; # remove trailing comma