[interchange-cvs] interchange - heins modified 5 files
interchange-core@icdevgroup.org
interchange-core@icdevgroup.org
Sat Oct 12 23:43:00 2002
User: heins
Date: 2002-10-13 03:42:49 GMT
Modified: lib/Vend Menu.pm
Modified: dist/foundation/dbconf/mysql tree.mysql
Modified: dist/foundation/dbconf/oracle tree.ora
Modified: dist/foundation/dbconf/pgsql tree.pgsql
Modified: dist/foundation/products mv_metadata.asc
Log:
* Regularize dhtml_tree to match dthml_flyout behavior.
* Allow dhtml_flyout and dhtml_tree to delete branches based on
transforms.
* Adjust tree database types to hold proper "member" field, add
metadata for member field.
Revision Changes Path
2.17 +30 -19 interchange/lib/Vend/Menu.pm
rev 2.17, prev_rev 2.16
Index: Menu.pm
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvs/interchange/lib/Vend/Menu.pm,v
retrieving revision 2.16
retrieving revision 2.17
diff -u -r2.16 -r2.17
--- Menu.pm 3 Oct 2002 17:26:28 -0000 2.16
+++ Menu.pm 13 Oct 2002 03:42:49 -0000 2.17
@@ -1,6 +1,6 @@
# Vend::Menu - Interchange payment processing routines
#
-# $Id: Menu.pm,v 2.16 2002/10/03 17:26:28 mheins Exp $
+# $Id: Menu.pm,v 2.17 2002/10/13 03:42:49 mheins Exp $
#
# Copyright (C) 2002 Mike Heins, <mike@perusion.net>
#
@@ -21,7 +21,7 @@
=20
package Vend::Menu;
=20
-$VERSION =3D substr(q$Revision: 2.16 $, 10);
+$VERSION =3D substr(q$Revision: 2.17 $, 10);
=20
use Vend::Util;
use strict;
@@ -345,7 +345,6 @@
my $list =3D $opt->{object}{mv_results};
$main =3D '';
for(@$list) {
-#::logDebug("here's a row: " . ::uneval($_));
$main .=3D menu_link($template, $_, $opt);
}
}
@@ -442,12 +441,13 @@
$o{iterator} =3D \&transforms_only;
Vend::Tags->tree(\%o);
delete $o{_transform};
- $rows =3D $o{object}{mv_results};
- $main =3D '';
- for(@$rows) {
-#::logDebug("here's a row: " . ::uneval($_));
+ my @o;
+ for(@{$o{object}{mv_results}}) {
+ next if $_->{deleted};
+ push @o, $_ unless $_->{deleted};
$main .=3D tree_line(undef, $_, \%o);
}
+ $rows =3D \@o;
}
=20
# Prevent possibility of memory leak
@@ -696,9 +696,8 @@
push @out, $header;
}
=20
-#::logDebug("Template is: $template");
for my $row (@$rows) {
-#::logDebug("Doing row: " . ::uneval($row));
+ next if $_->{deleted};
push @out, Vend::Tags->uc_attr_list($row, $template);
}
=20
@@ -754,7 +753,6 @@
subordinate =3D> 'code',
autodetect =3D> '1',
sort =3D> $opt->{sort} || 'code',
- iterator =3D> \&tree_line,
js_prefix =3D> $vpf,
full =3D> '1',
spacing =3D> '4',
@@ -765,8 +763,27 @@
$o{$_} =3D $opt->{$_};
}
=20
- push @out, Vend::Tags->tree(\%o);
-#::logDebug("out now=3D" . ::uneval(\@out) );
+ my $main;
+ my $rows;
+ if($opt->{iterator}) {
+ $o{iterator} =3D $opt->{iterator};
+ $main =3D Vend::Tags->tree(\%o);
+ $rows =3D $o{object}{mv_results};
+ }
+ else {
+ $o{iterator} =3D \&transforms_only;
+ Vend::Tags->tree(\%o);
+ delete $o{_transform};
+ my @o;
+ for(@{$o{object}{mv_results}}) {
+ next if $_->{deleted};
+ push @o, $_ unless $_->{deleted};
+ $main .=3D tree_line(undef, $_, \%o);
+ }
+ $rows =3D \@o;
+ }
+
+ push @out, $main;
if(defined $CGI::values{open}) {
$::Scratch->{dhtml_tree_open} =3D $CGI::values{open};
}
@@ -1029,7 +1046,6 @@
## returns UPPERCASE var name index defines for the fields.
sub tree_line {
my($template, $row, $opt) =3D @_;
-#::logDebug("tree_line: loopname=3D$opt->{loopname} row=3D" . uneval($row)=
);
=20
my @out;
my $fields;
@@ -1121,7 +1137,7 @@
}
=20
for(@{$opt->{_transform}}) {
- return unless $transform{$_}->($row, $opt->{$_});
+ $row->{deleted} =3D 1, return unless $transform{$_}->($row, $opt->{$_});
}
return;
}
@@ -1152,14 +1168,10 @@
=20
$row->{mv_ip} =3D $opt->{mv_ip}++ || 0;
$row->{mv_increment} =3D ++$opt->{mv_incrmement};
-#::logDebug("here's a row: " . ::uneval($row)) if $row->{debug};
=20
for(@{$opt->{_transform}}) {
-#::logDebug("doing $_ tranform") if $row->{debug};
return unless $transform{$_}->($row, $opt->{$_});
-#::logDebug("passed $_ tranform") if $row->{debug};
}
-#::logDebug("passed transforms, row now: " . ::uneval($row)) if $row->{de=
bug};
=20
#return $row->{name} if ! $row->{page} and $row->{name} =3D~ /^\s*</;
if(! $row->{page}) {
@@ -1341,7 +1353,6 @@
}
=20
return old_flyout($name,$opt,$template) unless $opt->{dhtml_browser};
-#::logDebug("ready to run dhtml_flyout");
return dhtml_flyout($name,$opt,$template);
}
elsif($opt->{menu_type} eq 'simple') {
1.2 +1 -0 interchange/dist/foundation/dbconf/mysql/tree.mysql
rev 1.2, prev_rev 1.1
Index: tree.mysql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvs/interchange/dist/foundation/dbconf/mysql/tree.mysql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tree.mysql 3 Aug 2002 21:37:29 -0000 1.1
+++ tree.mysql 13 Oct 2002 03:42:49 -0000 1.2
@@ -13,6 +13,7 @@
Database tree COLUMN_DEF "msort=3Dvarchar(8)"
Database tree COLUMN_DEF "extended=3Dtext"
Database tree COLUMN_DEF "inactive=3Dint not null default 0"
+Database tree COLUMN_DEF "member=3Dvarchar(1)"
Database tree INDEX parent_fld
Database tree INDEX mgroup
Database tree INDEX msort
1.2 +1 -0 interchange/dist/foundation/dbconf/oracle/tree.ora
rev 1.2, prev_rev 1.1
Index: tree.ora
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvs/interchange/dist/foundation/dbconf/oracle/tree.ora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tree.ora 3 Aug 2002 21:37:29 -0000 1.1
+++ tree.ora 13 Oct 2002 03:42:49 -0000 1.2
@@ -14,6 +14,7 @@
Database tree COLUMN_DEF "msort=3Dvarchar(8)"
Database tree COLUMN_DEF "extended=3Dvarchar2(4000)"
Database tree COLUMN_DEF "inactive=3Dint not null default 0"
+Database tree COLUMN_DEF "member=3Dvarchar(1)"
Database tree INDEX parent_fld
Database tree INDEX mgroup
Database tree INDEX msort
1.2 +1 -0 interchange/dist/foundation/dbconf/pgsql/tree.pgsql
rev 1.2, prev_rev 1.1
Index: tree.pgsql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvs/interchange/dist/foundation/dbconf/pgsql/tree.pgsql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tree.pgsql 3 Aug 2002 21:37:29 -0000 1.1
+++ tree.pgsql 13 Oct 2002 03:42:49 -0000 1.2
@@ -14,6 +14,7 @@
Database tree COLUMN_DEF "msort=3Dvarchar(8)"
Database tree COLUMN_DEF "extended=3Dtext"
Database tree COLUMN_DEF "inactive=3Dint not null default 0"
+Database tree COLUMN_DEF "member=3Dvarchar(1)"
Database tree INDEX parent_fld
Database tree INDEX mgroup
Database tree INDEX msort
2.17 +1 -0 interchange/dist/foundation/products/mv_metadata.asc
rev 2.17, prev_rev 2.16
Index: mv_metadata.asc
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvs/interchange/dist/foundation/products/mv_metadata.asc,v
retrieving revision 2.16
retrieving revision 2.17
diff -u -r2.16 -r2.17
--- mv_metadata.asc 6 Oct 2002 01:37:43 -0000 2.16
+++ mv_metadata.asc 13 Oct 2002 03:42:49 -0000 2.17
@@ -52,6 +52,7 @@
ichelp::helptext textarea 72 15 Help Text=09=09=09=09=09=09=09=09=09=
=09=09
icmenu 1 12 50 code=0Dmgroup=0Dmsort=0Dnext_line=0Dpage=0Dname(30)=0Dinact=
ive=0D Interchange menus code=0Dmgroup=0Dmsort=0Dnext_line=0Ddepends_on=
=0Dpage=0Dname=0Dinactive=09=09=09=09=09=09=09=09=09=09=09=09
icmenu::inactive yesno=09=09=09=09=09=09=09=09=09=09=09=09=09=09=09=09=09=
=09=09=09
+icmenu::member select =3DAll,1=3DMember only,0=3DNon-member only=09=
=09=09=09=09=09=09=09=09=09=09=09=09
icmenu::next_line yesno Go to next line Breaks menus at next line =
(or level)=09=09=09=09=09=09=09=09=09=09
icmenu::url text 50 External URL On some menus, causes a link to a=
n external URL instead of the internal one generated by "page" and "form".=
=09=09=09=09=09=09=09=09=09=09
icmenu::img_icon text 30 Title icon Icon image for display to the =
left of the name text. To replace name entirely, leave name blank (or make =
it an HTML comment).=09=09=09=09=09=09=09=09=09=09