Subversion Repositories CoffeeCatalog

Rev

Rev 7 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 7 Rev 9
Line 101... Line 101...
101 
			else { return "$colName = $filter"; }
 101 
			else { return "$colName = $filter"; }
102 
		}
 102 
		}
103 
		else
 103 
		else
104 
		{
 104 
		{
105 
			my $thing = "filter-${colName}";
 105 
			my $thing = "filter-${colName}";
106 
			return "<INPUT type=text name=$thing value=\"$FORM{$thing}\" size=15 $onChange>";
 106 
			return "<INPUT type=text name=$thing value=\"$FORM{$thing}\" size=2 $onChange>";
107 
		}
 107 
		}
108 
	} elsif ($colFilterTypeHash{$colName} eq 'date') {
 108 
	} elsif ($colFilterTypeHash{$colName} eq 'date') {
109 
		if (defined $filter)
 109 
		if (defined $filter)
110 
		{
 110 
		{
111 
			if ($filter =~ s/^<\s*//) { return "$colName < '$filter'"; }
 111 
			if ($filter =~ s/^<\s*//) { return "$colName < '$filter'"; }
Line 127... Line 127...
127 
sub getData {
 127 
sub getData {
128 
	my $fields = shift;
 128 
	my $fields = shift;
129 
	my $whereClause = shift;
 129 
	my $whereClause = shift;
130 
	my $table = shift;
 130 
	my $table = shift;
131 
	my $orderby = shift;
 131 
	my $orderby = shift;
- 
 
 132 
	my $curpage = shift // 0;
- 
 
 133 
	my $pagelimit = shift // "All";
- 
 
 134
132 
#	my $RCid = shift;
 135 
#	my $RCid = shift;
133 
#	my $SecLvl = shift;
 136 
#	my $SecLvl = shift;
Line 134... Line 137...
134
137
135 
#	my $selected = join ", ",  @{$fields};
 138 
#	my $selected = join ", ",  @{$fields};
136 
	my $selected = '*';
 139 
	my $selected = '*';
137 
	$whereClause = scalar @{$whereClause} > 0 ? "where ".join " and ", @{$whereClause} : '';
 140 
	$whereClause = scalar @{$whereClause} > 0 ? "where ".join " and ", @{$whereClause} : '';
138 
        # project in new DB?
 141 
        # project in new DB?
139 
	# my $getMe = "select distinct $selected from HOST left join PRODUCT_INSTANCE on HOST.server = PRODUCT_INSTANCE.server left join project on hostID = projectHostID $whereClause";
 142 
	# my $getMe = "select distinct $selected from HOST left join PRODUCT_INSTANCE on HOST.server = PRODUCT_INSTANCE.server left join project on hostID = projectHostID $whereClause";
140 
	#my $getMe = "select distinct $selected from HOST left join PRODUCT_INSTANCE on HOST.server=PRODUCT_INSTANCE.server $whereClause and HOST.page=HOST.maxPage and PRODUCT_INSTANCE.page = PRODUCT_INSTANCE.maxPage";
 143 
	#my $getMe = "select distinct $selected from HOST left join PRODUCT_INSTANCE on HOST.server=PRODUCT_INSTANCE.server $whereClause and HOST.page=HOST.maxPage and PRODUCT_INSTANCE.page = PRODUCT_INSTANCE.maxPage";
- 
 
 144
- 
 
 145 
  if ($colFilterTypeHash{$orderby} eq "date") {
- 
 
 146 
   	$orderby = $orderby eq "" ? "" : "order by $orderby desc";
141 
 
 147 
  } else {
- 
 
 148 
	  $orderby = $orderby eq "" ? "" : "order by $orderby";
142 
	$orderby = $orderby eq "" ? "" : "order by $orderby";
 149 
  }
- 
 
 150 
#	my $getMe = "select distinct $selected from $table $whereClause $orderby";
- 
 
 151 
  my $getMe;
143 
#	my $getMe = "select distinct $selected from $table $whereClause $orderby";
 152 
  if ($pagelimit eq "All") {
- 
 
 153 
  	$getMe = "select distinct * from $table $whereClause $orderby";
- 
 
 154 
  } else {
- 
 
 155 
    $curpage = ($curpage - 1) * $pagelimit;
- 
 
 156 
  	$getMe = "select distinct * from $table $whereClause $orderby limit $curpage, $pagelimit";
- 
 
 157 
  }
144 
	my $getMe = "select distinct * from $table $whereClause $orderby";
 158 
	my ($totalcount) = $internalDBH->selectrow_array ("select distinct count(*) from $table $whereClause");
Line 145... Line 159...
145 
#warn($getMe);
 159 
#warn($getMe);
146 
 
 160 
 
Line 157... Line 171...
157 
#		}
 171 
#		}
Line 158... Line 172...
158
172
159 
		push @results, $P;
 173 
		push @results, $P;
Line 160... Line 174...
160 
	}
 174 
	}
161
175
Line 162... Line 176...
162 
	return \@results;
 176 
	return (\@results, $totalcount);