ispman/ispman-web/cgi-bin/tmpl/modules editModule.tmpl,1.6,1.7

Update of /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/modules
In directory sc8-pr-cvs1:/tmp/cvs-serv23884

Modified Files:
	editModule.tmpl 
Log Message:
not using DN as the hash key. Results are different depending on the spaces etc. Creating a simpler hash to get values from.

Index: editModule.tmpl
===================================================================
RCS file: /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/modules/editModule.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- editModule.tmpl	13 Jan 2004 23:05:59 -0000	1.6
+++ editModule.tmpl	16 Jan 2004 17:39:03 -0000	1.7
@@ -10,7 +10,14 @@
 
         <perl>
         my $text="";
-        my $moduleinfo=$ispman->{'moduleinfo'};
+		my $vars=$ispman->getConfVars($r->param('module'));
+
+		for (keys %$vars){
+			$ispmanVars->{$vars->{$_}{'ispmanVar'}}{'ispmanQuestion'}=$vars->{$_}{'ispmanQuestion'};
+			$ispmanVars->{$vars->{$_}{'ispmanVar'}}{'ispmanVal'}=$vars->{$_}{'ispmanVal'};
+			$ispmanVars->{$vars->{$_}{'ispmanVar'}}{'ispmanVarAlias'}=$vars->{$_}{'ispmanVarAlias'};
+		}
+
 
 		my $module=$r->param("module");
 		if ($ispman->{'Config'}{'ispmanVarSort'}{$module}){
@@ -18,13 +25,11 @@
 			my ($varDN, $ispmanQuestion, $ispmanVarAlias, $ispmanVar, $ispmanVal);
 		
 			for (@$varSort){
-				$varDN=$ispman->getConfVarDN($module, $_);
-				$varDN=~s/ //g;
 				
-				$ispmanVar=$moduleinfo->{$varDN}{'ispmanVar'};
-				$ispmanVal=$moduleinfo->{$varDN}{'ispmanVal'};
-				$ispmanQuestion=$moduleinfo->{$varDN}{'ispmanQuestion'};
-				$ispmanVarAlias=$moduleinfo->{$varDN}{'ispmanVarAlias'};
+				$ispmanVar=$_;
+				$ispmanVal=$ispmanVars->{$_}{'ispmanVal'};
+				$ispmanQuestion=$ispmanVars->{$_}{'ispmanQuestion'};
+				$ispmanVarAlias=$ispmanVars->{$_}{'ispmanVarAlias'};
 
 				$text.="<TR><TD COLSPAN=2 bgcolor=WHITE><I>$ispmanQuestion</i></td></tr>\n";
 				$text.=qq|
@@ -35,12 +40,12 @@
 
 			}
 		} else {
-			for (keys %$moduleinfo){
-				$text.="<TR><TD COLSPAN=2 bgcolor=WHITE><I>$moduleinfo->{$_}{'ispmanQuestion'}</i></td></tr>\n";
+			for (keys %$vars){
+				$text.="<TR><TD COLSPAN=2 bgcolor=WHITE><I>$vars->{$_}{'ispmanQuestion'}</i></td></tr>\n";
 				$text.=qq|
 				<TR>
-				<TD class=menuheader>@{[($moduleinfo->{$_}{'ispmanVarAlias'})?$moduleinfo->{$_}{'ispmanVarAlias'}:$moduleinfo->{$_}{'ispmanVar'}]}</td>
-				<TD><INPUT TYPE="TEXT" NAME="$moduleinfo->{$_}{'ispmanVar'}" size=40 value="$moduleinfo->{$_}{'ispmanVal'}"></td>
+				<TD class=menuheader>@{[($vars->{$_}{'ispmanVarAlias'})?$vars->{$_}{'ispmanVarAlias'}:$vars->{$_}{'ispmanVar'}]}</td>
+				<TD><INPUT TYPE="TEXT" NAME="$vars->{$_}{'ispmanVar'}" size=40 value="$vars->{$_}{'ispmanVal'}"></td>
 				</tr>|;
 			}
 		}




-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn