add makefile and autogen support for the facet definition bits; more minor bug fixing...

git-svn-id: svn://svn.open-ils.org/ILS/trunk@16061 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/Makefile.am b/Open-ILS/src/Makefile.am
index c726383..0daeebf 100644 (file)
--- a/Open-ILS/src/Makefile.am
+++ b/Open-ILS/src/Makefile.am
@@ -38,6 +38,7 @@ autojsbinscripts = @srcdir@/extras/fieldmapper.pl \
         @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 \

diff --git a/Open-ILS/src/extras/autogen.sh b/Open-ILS/src/extras/autogen.sh
index 3dbac70..7a81711 100755 (executable)
--- a/Open-ILS/src/extras/autogen.sh
+++ b/Open-ILS/src/extras/autogen.sh
@@ -113,6 +113,10 @@ echo "Updating Search Groups";
 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";

diff --git a/Open-ILS/src/extras/facet_types_js.pl b/Open-ILS/src/extras/facet_types_js.pl
index 50e0890..3bae8ea 100644 (file)
--- a/Open-ILS/src/extras/facet_types_js.pl
+++ b/Open-ILS/src/extras/facet_types_js.pl
@@ -77,12 +77,12 @@ sub build_tree_js {
         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