[interchange-cvs] interchange - heins modified 7 files
interchange-core@interchange.redhat.com
interchange-core@interchange.redhat.com
Mon Feb 4 18:36:02 2002
User: heins
Date: 2002-02-04 23:35:37 GMT
Modified: code/UI_Tag db_columns.coretag display.coretag
Modified: list_databases.coretag list_keys.coretag
Modified: dist/lib/UI Primitive.pm
Modified: dist/lib/UI/pages/admin item.html search_replace.html
Log:
* Further break out Vend::Form access to display tag. Eliminate
all widget routines from UI::Primitive.
* Add ability to get back an array instead of a joined string
to $Tag->list_databases,$Tag->list_keys,$Tag->db_columns,
Revision Changes Path
1.2 +1 -0 interchange/code/UI_Tag/db_columns.coretag
rev 1.2, prev_rev 1.1
Index: db_columns.coretag
===================================================================
RCS file: /anon_cvs/repository/interchange/code/UI_Tag/db_columns.coretag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- db_columns.coretag 29 Jan 2002 05:52:40 -0000 1.1
+++ db_columns.coretag 4 Feb 2002 23:35:36 -0000 1.2
@@ -47,6 +47,7 @@
@cols = UI::Primitive::ui_acl_grep( $acl, 'fields', @cols);
}
+ return @cols if wantarray;
return join $joiner, @cols;
}
EOR
1.2 +234 -43 interchange/code/UI_Tag/display.coretag
rev 1.2, prev_rev 1.1
Index: display.coretag
===================================================================
RCS file: /anon_cvs/repository/interchange/code/UI_Tag/display.coretag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- display.coretag 29 Jan 2002 05:52:40 -0000 1.1
+++ display.coretag 4 Feb 2002 23:35:36 -0000 1.2
@@ -1,52 +1,221 @@
UserTag display Order table column key
+UserTag display attrAlias col column
UserTag display addAttr 1
UserTag display Interpolate 1
UserTag display posNumber 3
UserTag display Routine <<EOR
+use UI::Primitive;
+use vars qw/$Tag/;
+my $base_entry_value;
sub {
my ($table,$column,$key,$opt) = @_;
-
- my $text;
- my $size;
- my $widget;
- my $label;
- my $help;
- my $help_url;
- my $template = $opt->{type} eq 'hidden' ? '' : $opt->{template};
- if($template and $template !~ /\s/) {
- $template = <<'EOF';
-<TR>
-<TD>
- <B>$LABEL$</B>
-</TD>
-<TD VALIGN=TOP>
- <TABLE CELLSPACING=0 CELLMARGIN=0><TR><TD>$WIDGET$</TD><TD><I>$HELP$</I>{HELP_URL}<BR><A HREF="$HELP_URL$">help</A>{/HELP_URL}</TD></TR></TABLE>
-</TD>
-</TR>
-EOF
- $opt->{template} = 1;
+ if( ref($opt) ne 'HASH' ) {
+ $opt = get_option_hash($opt);
}
-#::logDebug("meta call: table=$table col=$column key=$key text=$text");
- $text = tag_data($table, $column, $key) if $table and $column and $key;
+ my $template = $opt->{type} eq 'hidden' ? '' : $opt->{template};
+
if($opt->{override}) {
- $text = $opt->{default};
+ $opt->{value} = defined $opt->{default} ? $opt->{default} : undef;
}
- elsif (not defined $text) {
- $text = length($opt->{default}) ? $opt->{default} : $CGI::values{$column};
+
+ if(! defined $opt->{value} and $table and $column and length($key)) {
+ $opt->{value} = tag_data($table, $column, $key);
}
-#::logDebug("data call failed: $@") if $@;
- if(! $CGI::values{ui_no_meta_display}) {
-#::logDebug("meta call: table=$table col=$column key='$key' text=$text");
- ($widget, $label, $help, $help_url) = UI::Primitive::meta_display($table,$column,$key,$text,undef,undef,$opt);
-#::logDebug("past meta_display, help=$help url=$help_url label=$label");
- $widget =~ s/<(input|select)\s+/<$1 $opt->{js} /i
- if $opt->{js};
+ my $mtab;
+ my $record;
+
+ METALOOK: {
+ ## No meta display wanted
+ last METALOOK if $CGI::values{no_meta_display};
+ ## No meta display possible
+ $table and $column or $opt->{meta}
+ or last METALOOK;
+
+ ## We get a metarecord directly, though why it would be here
+ ## and not in options I don't know
+ if($opt->{meta} and ref($opt->{meta}) eq 'HASH') {
+ $record = $opt->{meta};
+ last METALOOK;
+ }
+
+ $mtab = $opt->{meta_table} || $::Variable->{UI_META_TABLE} || 'mv_metadata'
+ or last METALOOK;
+ my $meta = Vend::Data::database_exists_ref($mtab)
+ or do {
+ ::logError("non-existent meta table: %s", $mtab);
+ undef $mtab;
+ last METALOOK;
+ };
+
+ my $view = $opt->{view} || $opt->{arbitrary};
+
+ ## This is intended to trigger on the first access
+ if($column eq $meta->config('KEY')) {
+ if($view and $opt->{value} !~ /::.+::/) {
+ $base_entry_value = ($opt->{value} =~ /^([^:]+)::(\w+)$/)
+ ? $1
+ : $opt->{value};
+ }
+ else {
+ $base_entry_value = $opt->{value} =~ /::/
+ ? $table
+ : $opt->{value};
+ }
+ }
+
+ my (@tries) = "${table}::$column";
+ unshift @tries, "${table}::${column}::$key"
+ if length($key)
+ and $CGI::values{ui_meta_specific} || $opt->{specific};
+
+ my $sess = $Vend::Session->{mv_metadata} || {};
+
+ push @tries, { type => $opt->{type} }
+ if $opt->{type} || $opt->{label};
+
+ for my $metakey (@tries) {
+ ## In case we were passed a meta record
+ last if $record = $sess->{$metakey} and ref $record;
+ $record = UI::Primitive::meta_record($metakey, $view, $meta)
+ and last;
+ }
+ }
+
+ my $w;
+
+ METAMAKE: {
+ last METAMAKE unless $record;
+
+ ## Here we allow override with the display tag, even with views and
+ ## extended
+ my @override = qw/
+ append
+ attribute
+ db
+ extra
+ field
+ filter
+ height
+ help
+ help_url
+ label
+ lookup
+ lookup_exclude
+ lookup_query
+ name
+ options
+ outboard
+ passed
+ pre_filter
+ prepend
+ type
+ width
+ /;
+ for(keys %$record) {
+ delete $record->{$_} if ! length($record->{$_});
+ next unless defined $opt->{$_};
+ $record->{$_} = $opt->{$_};
+ }
+
+ $record->{name} ||= $column;
+
+ if($record->{options} and $record->{options} =~ /^[\w:]+$/) {
+#::logDebug("checking options");
+ PASS: {
+ my $passed = $record->{options};
+
+ if($passed eq 'tables') {
+ my @tables = $Tag->list_databases();
+ $record->{passed} = join (',', "=--none--", @tables);
+ }
+ elsif($passed eq 'filters') {
+ $record->{passed} = $Tag->filters(1),
+ }
+ elsif($passed =~ /^columns(::(\w*))?\s*$/) {
+ my $total = $1;
+ my $tname = $2 || $record->{db} || $table;
+ if ($total eq '::' and $base_entry_value) {
+ $tname = $base_entry_value;
+ }
+ $record->{passed} = join ",",
+ "=--none--",
+ $Tag->db_columns($tname),
+ ;
+ }
+ elsif($passed =~ /^keys(::(\w+))?\s*$/) {
+ my $tname = $2 || $record->{db} || $table;
+ $record->{passed} = join ",",
+ "=--none--",
+ $Tag->list_keys($tname),
+ ;
+ }
+ }
+ }
+
+ if ($record->{type} =~ s/^custom\s+//s) {
+ my $wid = lc $record->{type};
+ $wid =~ tr/-/_/;
+ my $w;
+ $record->{attribute} ||= $column;
+ $record->{table} ||= $mtab;
+ $record->{rows} ||= $record->{height};
+ $record->{cols} ||= $record->{width};
+ $record->{field} ||= 'options';
+ $record->{name} ||= $column;
+ my $Tag = new Vend::Tags;
+ eval {
+ $w = $Tag->$wid($record->{name}, $opt->{value}, $record, $opt);
+ };
+ if($@) {
+ ::logError("error using custom widget %s: %s", $wid, $@);
+ }
+ last METAMAKE;
+ }
+
+ for(qw/append prepend/) {
+ next unless $record->{$_};
+ $record->{$_} = Vend::Util::resolve_links($record->{$_});
+ $record->{$_} =~ s/_UI_VALUE_/$opt->{value}/g;
+ $record->{$_} =~ /_UI_URL_VALUE_/
+ and do {
+ my $tmp = $opt->{value};
+ $tmp =~ s/(\W)/sprintf '%%%02x', ord($1)/eg;
+ $record->{$_} =~ s/_UI_URL_VALUE_/$tmp/g;
+ };
+ $record->{$_} =~ s/_UI_TABLE_/$table/g;
+ $record->{$_} =~ s/_UI_COLUMN_/$column/g;
+ $record->{$_} =~ s/_UI_KEY_/$key/g;
+ }
+
+#::logDebug("passed=$record->{passed}") if $record->{debug};
+ my %things = (
+ attribute => $column,
+ cols => $opt->{cols} || $record->{width},
+ field => $column,
+ passed => $record->{options},
+ rows => $opt->{rows} || $record->{height},
+ table => $table,
+ value => $opt->{value},
+ );
+
+ while( my ($k, $v) = each %things) {
+ next if length $record->{$k};
+ $record->{$k} = $v;
+ }
+
+ $w = Vend::Form::display($record);
+ if($record->{filter}) {
+ $w .= qq{<INPUT TYPE=hidden NAME="ui_filter:$record->{name}" VALUE="};
+ $w .= $record->{filter};
+ $w .= '">';
+ }
}
- if(! $widget and $opt->{type} ne 'value') {
+ if(! defined $w) {
+ my $text = $opt->{value};
my $iname = $opt->{name} || $column;
my $DECODE_CHARS = qq{[<"\000-\037\177-\377};
@@ -56,31 +225,54 @@
HTML::Entities::encode($text, '&');
HTML::Entities::encode($text, $DECODE_CHARS);
+ my $size;
if ($count) {
$count++;
$count = 20 if $count > 20;
- $widget = <<EOF;
+ $w = <<EOF;
<TEXTAREA NAME="$iname" COLS=60 ROWS=$count>$text</TEXTAREA>
EOF
}
elsif ($text =~ /^\d+$/) {
- $size = 8;
+ my $cur = length($text);
+ $size = $cur > 8 ? $cur + 1 : 8;
}
else {
$size = 60;
}
- $widget = <<EOF;
+ $w = <<EOF;
<INPUT NAME="$iname" SIZE=$size VALUE="$text">
EOF
}
- return $widget unless $template;
- $label = $column if ! $label;
+
+ return $w unless $template;
+
+ if($template and $template !~ /\s/) {
+ $template = <<'EOF';
+<TR>
+<TD>
+ <B>$LABEL$</B>
+</TD>
+<TD VALIGN=TOP>
+ <TABLE CELLSPACING=0 CELLMARGIN=0><TR><TD>$WIDGET$</TD><TD><I>$HELP$</I>{HELP_URL}<BR><A HREF="$HELP_URL$">help</A>{/HELP_URL}</TD></TR></TABLE>
+</TD>
+</TR>
+EOF
+ }
+
+ $record->{label} ||= $column;
+
my %sub = (
- WIDGET => $widget,
- HELP => $opt->{applylocale} ? errmsg($help) : $help,
- HELP_URL => $help_url,
- LABEL => $opt->{applylocale} ? errmsg($label) : $label,
+ WIDGET => $w,
+ HELP => $opt->{applylocale}
+ ? errmsg($record->{help})
+ : $record->{help},
+ HELP_URL => $record->{help_url},
+ LABEL => $opt->{applylocale}
+ ? errmsg($record->{label})
+ : $record->{label},
);
+
# Strip the {TAG} {/TAG} pairs if nothing there
$template =~ s#{([A-Z_]+)}(.*?){/\1}#$sub{$1} ? $2: '' #ges;
# Insert the TAG
@@ -88,4 +280,3 @@
return $template;
}
EOR
-
1.2 +1 -1 interchange/code/UI_Tag/list_databases.coretag
rev 1.2, prev_rev 1.1
Index: list_databases.coretag
===================================================================
RCS file: /anon_cvs/repository/interchange/code/UI_Tag/list_databases.coretag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- list_databases.coretag 29 Jan 2002 05:52:40 -0000 1.1
+++ list_databases.coretag 4 Feb 2002 23:35:36 -0000 1.2
@@ -1,4 +1,3 @@
-
UserTag list-databases Order nohide extended
UserTag list-databases routine <<EOR
sub {
@@ -32,6 +31,7 @@
@dbs = $nohide ? (@dbs) : (@outdb);
}
+ return @dbs if wantarray;
my $string = join " ", grep /\S/, @dbs;
return $string;
}
1.2 +1 -0 interchange/code/UI_Tag/list_keys.coretag
rev 1.2, prev_rev 1.1
Index: list_keys.coretag
===================================================================
RCS file: /anon_cvs/repository/interchange/code/UI_Tag/list_keys.coretag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- list_keys.coretag 29 Jan 2002 05:52:40 -0000 1.1
+++ list_keys.coretag 4 Feb 2002 23:35:36 -0000 1.2
@@ -62,6 +62,7 @@
#::logDebug("list_keys acl: ". ::uneval($acl));
@keys = UI::Primitive::ui_acl_grep( $acl, 'keys', @keys);
}
+ return @keys if wantarray;
return join("\n", @keys);
}
EOR
2.16 +22 -219 interchange/dist/lib/UI/Primitive.pm
rev 2.16, prev_rev 2.15
Index: Primitive.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/dist/lib/UI/Primitive.pm,v
retrieving revision 2.15
retrieving revision 2.16
diff -u -r2.15 -r2.16
--- Primitive.pm 4 Feb 2002 01:31:17 -0000 2.15
+++ Primitive.pm 4 Feb 2002 23:35:37 -0000 2.16
@@ -1,6 +1,6 @@
# UI::Primitive - Interchange configuration manager primitives
-# $Id: Primitive.pm,v 2.15 2002/02/04 01:31:17 mheins Exp $
+# $Id: Primitive.pm,v 2.16 2002/02/04 23:35:37 mheins Exp $
# Copyright (C) 1998-2001 Red Hat, Inc. <interchange@redhat.com>
@@ -25,7 +25,7 @@
package UI::Primitive;
-$VERSION = substr(q$Revision: 2.15 $, 10);
+$VERSION = substr(q$Revision: 2.16 $, 10);
$DEBUG = 0;
@@ -36,14 +36,19 @@
!;
use File::Find;
-use Vend::CounterFile;
-use Text::ParseWords;
use Exporter;
use strict;
use Vend::Util qw/errmsg/;
$DECODE_CHARS = qq{&[<"\000-\037\177-\377};
-@EXPORT = qw( ui_check_acl ui_acl_enabled meta_record) ;
+@EXPORT = qw(
+ list_glob
+ list_images
+ list_pages
+ meta_record
+ ui_acl_enabled
+ ui_check_acl
+ );
=head1 NAME
@@ -624,16 +629,25 @@
sub meta_record {
- my ($item, $view, $mtable) = @_;
+ my ($item, $view, $mdb) = @_;
+
+#::logDebug("meta_record: item=$item view=$view mdb=$mdb");
return undef unless $item;
- $mtable ||= $::Variable->{UI_META_TABLE} || 'mv_metadata',
- my $mdb = Vend::Data::database_exists_ref($mtable)
+
+ if(! ref ($mdb)) {
+ my $mtable = $mdb || $::Variable->{UI_META_TABLE} || 'mv_metadata';
+#::logDebug("meta_record mtable=$mtable");
+ $mdb = Vend::Data::database_exists_ref($mtable)
or return undef;
+ }
+#::logDebug("meta_record has an item=$item and mdb=$mdb");
+
my $record;
if($view) {
$record = $mdb->row_hash("${view}::$item");
}
$record = $mdb->row_hash($item) if ! $record;
+#::logDebug("meta_record record=$record");
return undef if ! $record;
@@ -658,217 +672,6 @@
}
#::logDebug("return meta_record=" . ::uneval($record) );
return $record;
-}
-
-my $base_entry_value;
-
-sub meta_display {
- my ($table,$column,$key,$value,$meta_db,$query,$o) = @_;
-
- my $metakey;
- $meta_db = $::Variable->{UI_META_TABLE} || 'mv_metadata' if ! $meta_db;
- $o = {} if ! ref $o;
- my $meta = Vend::Data::database_exists_ref($meta_db)
- or return undef;
- $meta = $meta->ref();
- if($column eq $meta->config('KEY')) {
- if($o->{arbitrary} and $value !~ /::.+::/) {
- $base_entry_value = ($value =~ /^([^:]+)::(\w+)$/)
- ? $1
- : $value;
- }
- else {
- $base_entry_value = $value =~ /::/ ? $table : $value;
- }
- }
-
- my (@tries) = "${table}::$column";
- unshift @tries, "${table}::${column}::$key"
- if $key;
-
- my $view;
- if($view = $o->{arbitrary}) {
- unshift @tries, "$o->{arbitrary}::${table}::${column}";
- unshift @tries, "$o->{arbitrary}::${table}::${column}::$key" if $key;
- }
-
- my $sess = $Vend::Session->{mv_metadata} || {};
-
- push @tries, { type => $o->{type} }
- if $o->{type} || $o->{label};
-
-#::logDebug("calling meta_display with type=$o->{type}");
- for $metakey (@tries) {
- my $record;
- unless ( $record = $sess->{$metakey} and ref $record ) {
- if(ref $metakey) {
- $record = $metakey;
- undef $metakey;
- }
- else {
- next unless $meta->record_exists($metakey);
- $record = $meta->row_hash($metakey);
- }
- }
- if($query) {
- return $record->{query};
- }
- my $opt;
-
- # Get additional settings from extended field, which is a serialized
- # hash
- my $hash;
- if($record->{extended}) {
- $hash = Vend::Util::get_option_hash($record->{extended});
- if(ref $hash) {
- @$record{keys %$hash} = values %$hash;
- }
- else {
- undef $hash;
- }
- }
-
- # Allow view settings to be placed in the extended area
- if($view and $hash and $hash->{view}) {
- my $view_hash = $record->{view}{$view};
- ref $view_hash
- and @$record{keys %$view_hash} = values %$view_hash;
- }
-
- ## Here we allow override with the display tag, even with views and
- ## extended
- my @override = qw/
- append
- attribute
- db
- extra
- field
- filter
- height
- help
- help_url
- label
- lookup
- lookup_exclude
- lookup_query
- name
- options
- outboard
- passed
- pre_filter
- prepend
- type
- width
- /;
- for(@override) {
- delete $record->{$_} if ! length($record->{$_});
- next unless defined $o->{$_};
- $record->{$_} = $o->{$_};
- }
-
- $record->{name} ||= $column;
-
- if($record->{options} and $record->{options} =~ /^[\w:]+$/) {
-#::logDebug("checking options");
- PASS: {
- my $passed = $record->{options};
-
- if($passed eq 'tables') {
- $record->{passed} = "=--none--," . list_tables({ joiner => ',' });
- }
- elsif($passed eq 'filters') {
- $record->{passed} = $Vend::Interpolate::Tag->filters(1),
- }
- elsif($passed =~ /^columns(::(\w*))?\s*$/) {
- my $total = $1;
- my $tname = $2 || $record->{db} || $table;
-::logDebug("columns options, total=$total tname=$tname base_entry_value=$base_entry_value");
- if ($total eq '::' and $base_entry_value) {
- $tname = $base_entry_value;
- }
- my $db = ::database_exists_ref($tname);
- $record->{passed} = join (',', "=--none--", $db->columns())
- if $db;
- }
- elsif($passed =~ /^keys(::(\w+))?\s*$/) {
- my $tname = $2 || $record->{db} || $table;
- $record->{passed} = "=--none--," . list_keys($tname, { joiner => ',' });
- }
- }
- }
-
- if ($record->{type} =~ s/^custom\s+//s) {
- my $wid = lc $record->{type};
- $wid =~ tr/-/_/;
- my $w;
- $record->{attribute} ||= $column;
- $record->{table} ||= $meta_db;
- $record->{rows} ||= $record->{height};
- $record->{cols} ||= $record->{width};
- $record->{field} ||= 'options';
- $record->{name} ||= $column;
- $record->{outboard} ||= $metakey;
- my $Tag = new Vend::Tags;
- eval {
- $w = $Tag->$wid($record->{name}, $value, $record, $o);
- };
- if($@) {
- ::logError("error using custom widget %s: %s", $wid, $@);
- }
- return $w unless $o->{template};
- return ($w, $record->{label}, $record->{help}, $record->{help_url});
- }
-
- for(qw/append prepend/) {
- next unless $record->{$_};
- $record->{$_} = Vend::Util::resolve_links($record->{$_});
- $record->{$_} =~ s/_UI_VALUE_/$value/g;
- $record->{$_} =~ /_UI_URL_VALUE_/
- and do {
- my $tmp = $value;
- $tmp =~ s/(\W)/sprintf '%%%02x', ord($1)/eg;
- $record->{$_} =~ s/_UI_URL_VALUE_/$tmp/g;
- };
- $record->{$_} =~ s/_UI_TABLE_/$table/g;
- $record->{$_} =~ s/_UI_COLUMN_/$column/g;
- $record->{$_} =~ s/_UI_KEY_/$key/g;
- }
-
- if(! $o->{type} and ! $record->{type}) {
- $o->{type} = 'text' unless $record->{passed};
- }
-# Copied above
-# append attribute db extra field filter height help help_url js label lookup
-# lookup_exclude name options outboard passed pre_filter prepend
-# type width
-
-::logDebug("passed=$record->{passed}") if $record->{debug};
- my %things = (
- attribute => $column,
- cols => $o->{cols} || $record->{width},
- field => $column,
- passed => $record->{options},
- rows => $o->{rows} || $record->{height},
- table => $table,
- value => $value,
- );
-
- while( my ($k, $v) = each %things) {
- next if length $record->{$k};
- $record->{$k} = $v;
- }
-
- my $w = Vend::Form::display($record);
- my $filter;
- if($record->{filter}) {
- $w .= qq{<INPUT TYPE=hidden NAME="ui_filter:$record->{name}" VALUE="};
- $w .= $record->{filter};
- $w .= '">';
- }
- return $w unless $o->{template};
- return ($w, $record->{label}, $record->{help}, $record->{help_url});
- }
- return undef;
}
1;
2.7 +3 -3 interchange/dist/lib/UI/pages/admin/item.html
rev 2.7, prev_rev 2.6
Index: item.html
===================================================================
RCS file: /anon_cvs/repository/interchange/dist/lib/UI/pages/admin/item.html,v
retrieving revision 2.6
retrieving revision 2.7
diff -u -r2.6 -r2.7
--- item.html 14 Oct 2001 00:22:19 -0000 2.6
+++ item.html 4 Feb 2002 23:35:37 -0000 2.7
@@ -120,7 +120,7 @@
my $view = $CGI->{ui_meta_view};
my $ref = $Db{$tab};
my $meta = $Tag->meta_record($tab, $view);
-Debug("Meta record: " . uneval($meta));
+#Debug("Meta record: " . uneval($meta));
if (! $ref) {
$Scratch->{keypos} = 0;
return;
@@ -236,7 +236,7 @@
$CGI->{ui_list_size} = $meta->{height}
if ! $CGI->{ui_list_size};
$CGI->{ui_show_fields} ||= $meta->{ui_show_fields} || $meta->{field};
-Debug("CGI->{ui_show_fields}=$CGI->{ui_show_fields}");
+#Debug("CGI->{ui_show_fields}=$CGI->{ui_show_fields}");
if(! $CGI->{ui_show_fields}) {
$CGI->{ui_show_fields} = '*';
$CGI->{ui_description_fields} = join ",", $ref->columns();
@@ -245,7 +245,7 @@
my $i = 0;
$CGI->{ui_show_fields} =~
s/(\w+)(?:\((.*?)\))?/ ($filter_show[$i++] = $2), $1/eg;
-Debug("filter_show: " . $Tag->uneval( { ref => \@filter_show } ));
+#Debug("filter_show: " . $Tag->uneval( { ref => \@filter_show } ));
$CGI->{ui_show_fields} =~ s/[\0,\s]+/,/g;
$CGI->{ui_description_fields} = $CGI->{ui_show_fields};
}
1.3 +4 -4 interchange/dist/lib/UI/pages/admin/search_replace.html
rev 1.3, prev_rev 1.2
Index: search_replace.html
===================================================================
RCS file: /anon_cvs/repository/interchange/dist/lib/UI/pages/admin/search_replace.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- search_replace.html 3 Feb 2002 04:27:55 -0000 1.2
+++ search_replace.html 4 Feb 2002 23:35:37 -0000 1.3
@@ -129,15 +129,15 @@
my $regex;
if($sf =~ m{(^|[^\\])\(} and $sf =~ m{[^\\]\)}) {
-Debug("regex with parens, '$sf'");
+#Debug("regex with parens, '$sf'");
$sf =~ s/(.*?)\((.*)\)(.*)/($1)($2)($3)/;
-Debug("regex with parens, now '$sf'");
+#Debug("regex with parens, now '$sf'");
$regex = $cs ? qr{$sf} : qr{(?i)$sf};
}
else {
-Debug("regex without parens, '$sf'");
+#Debug("regex without parens, '$sf'");
$regex = $cs ? qr{()($sf)()} : qr{(?i)()($sf)()}i;
-Debug("regex without parens, now '$sf'");
+#Debug("regex without parens, now '$sf'");
}
delete $Scratch->{try_message};