Changeset 204

Timestamp:

1999-03-16T17:47:03+13:00 (25 years ago)

Author:

rjmcnab

Message:

Changed the list of arguments on the argument page to be the info list
not the current args list (there are some arguments which don't have
a default so they never make it onto the args list).

File:

• trunk/gsdl/src/recpt/statusaction.cpp (modified) (3 diffs)

trunk/gsdl/src/recpt/statusaction.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.10  1999/03/16 04:47:03  rjmcnab
+   Changed the list of arguments on the argument page to be the info list
+   not the current args list (there are some arguments which don't have
+   a default so they never make it onto the args list).
+
    Revision 1.9  1999/03/11 01:26:02  rjmcnab
    Fixed a few small formatting things.
@@ -190 +195 @@
   if (recpt == NULL) return;
   cgiargsinfoclass *rcargsinfo = recpt->get_cgiargsinfo_ptr ();
+  if (rcargsinfo == NULL) return;
 
   textout << outconvert << disp << "_status:header_(Argument Information)\n";
@@ -202 +208 @@
       << "<th>current value</th></tr>\n";
   
-  cgiargsclass::const_iterator argshere = args.begin();
-  cgiargsclass::const_iterator argsend = args.end();
-  cgiarginfo *ainfo;
-  
-  while (argshere != argsend) {
-    const text_t &aname = (*argshere).first;
+
+  cgiargsinfoclass::const_iterator argsinfohere = rcargsinfo->begin();
+  cgiargsinfoclass::const_iterator argsinfoend = rcargsinfo->end();
+  text_t *arg_value;
+  while (argsinfohere != argsinfoend) {
+    const cgiarginfo &ainfo = (*argsinfohere).second;
     textout << outconvert 
-        << "<tr valign=top><td>" << aname << "</td>\n";
-    
-    if ((rcargsinfo != NULL) && 
-    ((ainfo=rcargsinfo->getarginfo(aname)) != NULL)) {
-      textout << outconvert << "<td>" << ainfo->longname << "</td>\n";
-      if (ainfo->multiplechar) textout << outconvert << "<td>yes</td>\n";
-      else textout << outconvert << "<td>no</td>\n";
-      textout << outconvert << "<td>" << ainfo->argdefault << "</td>\n";
-      switch (ainfo->defaultstatus) {
-      case cgiarginfo::none: textout << outconvert << "<td>none</td>\n"; break;
-      case cgiarginfo::weak: textout << outconvert << "<td>weak</td>\n"; break;
-      case cgiarginfo::good: textout << outconvert << "<td>good</td>\n"; break;
-      case cgiarginfo::config: textout << outconvert << "<td>config</td>\n"; break;
-      case cgiarginfo::imperative: textout << outconvert << "<td>imperative</td>\n"; break;
-      }
-      switch (ainfo->savedarginfo) {
-      case cgiarginfo::mustnot: textout << outconvert << "<td>mustnot</td>\n"; break;
-      case cgiarginfo::can: textout << outconvert << "<td>can</td>\n"; break;
-      case cgiarginfo::must: textout << outconvert << "<td>must</td>\n"; break;
-      }
-    } else {
-      textout << outconvert << "<td colspan=5></td>\n";
-    }
-    
-    textout << outconvert << "<td>\"" << (*argshere).second << "\"</td></tr>\n";
-    
-    argshere ++;
+        << "<tr valign=top><td>" << ainfo.shortname << "</td>\n";
+    
+    textout << outconvert << "<td>" << ainfo.longname << "</td>\n";
+    if (ainfo.multiplechar) textout << outconvert << "<td>yes</td>\n";
+    else textout << outconvert << "<td>no</td>\n";
+    textout << outconvert << "<td>" << ainfo.argdefault << "</td>\n";
+    switch (ainfo.defaultstatus) {
+    case cgiarginfo::none: textout << outconvert << "<td>none</td>\n"; break;
+    case cgiarginfo::weak: textout << outconvert << "<td>weak</td>\n"; break;
+    case cgiarginfo::good: textout << outconvert << "<td>good</td>\n"; break;
+    case cgiarginfo::config: textout << outconvert << "<td>config</td>\n"; break;
+    case cgiarginfo::imperative: textout << outconvert << "<td>imperative</td>\n"; break;
+    }
+    switch (ainfo.savedarginfo) {
+    case cgiarginfo::mustnot: textout << outconvert << "<td>mustnot</td>\n"; break;
+    case cgiarginfo::can: textout << outconvert << "<td>can</td>\n"; break;
+    case cgiarginfo::must: textout << outconvert << "<td>must</td>\n"; break;
+    }
+    
+    arg_value = args.getarg (ainfo.shortname);
+    if (arg_value == NULL) textout << outconvert << "<td></td></tr>\n";
+    else textout << outconvert << "<td>\"" << *arg_value << "\"</td></tr>\n";
+    
+    argsinfohere ++;
   }