[yast-commit] r39616 - /trunk/squid/src/Squid.ycp

23 Jul 2007

Author: dfiser
Date: Mon Jul 23 17:51:47 2007
New Revision: 39616

URL: http://svn.opensuse.org/viewcvs/yast?rev=39616&view=rev
Log:
Beginning of Squid::Read function.

Modified:
    trunk/squid/src/Squid.ycp

Modified: trunk/squid/src/Squid.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/Squid.ycp?rev=39616&r1=39615&r2=39616&view=diff
==============================================================================

--- trunk/squid/src/Squid.ycp (original)
+++ trunk/squid/src/Squid.ycp Mon Jul 23 17:51:47 2007
@@ -40,15 +40,62 @@
 import "Summary";
 import "Message";
 
+path squid_path = .squid;
+
+
 /**
- * Prototypes
+ * Data was modified?
  */
-global boolean Modified();
+boolean modified = false;
 
 /**
- * Data was modified?
+ * Map of all configuration settings except consequential
+ */
+map settings = $[];
+
+/**
+ * List of http_ports. Format:
+ * [ $["host" : "hostname",
+ *     "port" : 3128,
+ *     "transparent" : true],
+ *     ...
+ * ]
+ */
+list  > http_ports = [];
+
+/** TODO
+ * List of acls. Format:
+ * [ $[ ???
+ */
+list  > acls = [];
+
+/**
+ * List of access control parameters. Format:
+ * [ $["allow" : true,
+ *     "acl" : ["acl1", "!acl2", ...] ],
+ *     ...
+ * ]
  */
-global boolean modified = false;
+list  > http_accesses = [];
+
+/**
+ * List of refresh patterns. Format:
+ * [ $["regexp" : "^ftp:",
+ *     "min" : 12,
+ *     "max" : 12,
+ *     "percent" : 12],
+ *     ...
+ * ]
+ */
+list  > refresh_patterns = [];
+
+
+
+
+global boolean Modified(){
+    return modified;
+}
+
 
 /**
  */
@@ -78,102 +125,83 @@
     return false;
 }
 
+
 /**
- * Data was modified?
- * @return true if modified
- */
-global boolean Modified() {
-    y2debug("modified=%1",modified);
-    return modified;
-}
+ * Read setting of parameter http_port. It can be in form:
+ * http_port [hostname:]port [transparent]
+ *
+ * return true on success
+ */
+boolean readHttpPorts()
+{
+    list tmp = [];
+    list tmp2 = [];
+    map  tmp_http_port = $[];
+
+    http_ports = [];
+    foreach (string value, (list<string>)SCR::Read(add(squid_path,"http_port")),
+        {
+            tmp_http_port = $[];
+            tmp = [];
+            tmp2 = [];
+
+            tmp = splitstring(value," \t");
+
+            //can parse only 'http_port hostname:port [transparent]'
+            if (size(tmp) < 1 || size(tmp) > 2) return false;
+
+            // hostname and port
+            tmp2 = splitstring(tmp[0]:"",":");
+            y2debug("readHttpPorts - tmp2: %1",tmp2);
+            if (size(tmp2) == 1){
+                tmp_http_port["host"] = "";
+                tmp_http_port["port"] = tointeger(tmp2[0]:"");
+            }else{
+                tmp_http_port["host"] = (string)tmp2[0]:"";
+                tmp_http_port["port"] = tointeger(tmp2[1]:"");
+            }
+
+            //transparent option
+            if (size(tmp) == 2 && tmp[1]:"" == "transparent")
+                tmp_http_port["transparent"] = true;
 
-// Settings: Define all variables needed for configuration of squid
-// TODO FIXME: Define all the variables necessary to hold
-// TODO FIXME: the configuration here (with the appropriate
-// TODO FIXME: description)
-// TODO FIXME: For example:
-//   /**
-//    * List of the configured cards.
-//    */
-//   list cards = [];
-//
-//   /**
-//    * Some additional parameter needed for the configuration.
-//    */
-//   boolean additional_parameter = true;
+            http_ports = add(http_ports, tmp_http_port);
+        });
+
+    return true;
+}
 
 /**
  * Read all squid settings
  * @return true on success
  */
 global boolean Read() {
+    boolean ok = true;
 
     /* Squid read dialog caption */
     string caption = _("Initializing squid Configuration");
 
-    // TODO FIXME Set the right number of stages
-    integer steps = 4;
-
-    integer sl = 500;
-    sleep(sl);
+    integer steps = 2;
 
-    // TODO FIXME Names of real stages
-    // We do not set help text here, because it was set outside
-    Progress::New( caption, " ", steps, [
-	    /* Progress stage 1/3 */
-	    _("Read the database"),
-	    /* Progress stage 2/3 */
-	    _("Read the previous settings"),
-	    /* Progress stage 3/3 */
-	    _("Detect the devices")
-	], [
-	    /* Progress step 1/3 */
-	    _("Reading the database..."),
-	    /* Progress step 2/3 */
-	    _("Reading the previous settings..."),
-	    /* Progress step 3/3 */
-	    _("Detecting the devices..."),
-	    /* Progress finished */
-	    _("Finished")
-	],
-	""
-    );
+    Progress::New(caption, " ", steps, [_("Read the settings")], [_("Reading the settings..."), _("Finished")], "");
 
-    // read database
     if(Abort()) return false;
     Progress::NextStage();
-    /* Error message */
-    if(false) Report::Error(_("Cannot read database1."));
-    sleep(sl);
 
-    // read another database
-    if(Abort()) return false;
-    Progress::NextStep();
-    /* Error message */
-    if(false) Report::Error(_("Cannot read database2."));
-    sleep(sl);
+    if (!readHttpPorts()) ok = false;
+    // TODO:
+    //if (!readRefreshPatterns()) ok = false;
+    //if (!readACLs()) ok = false;
+    //if (!readHttpAccesses()) ok = false;
+    //if (!readRestSetting()) ok = false;
 
-    // read current settings
-    if(Abort()) return false;
-    Progress::NextStage();
-    /* Error message */
-    if(false) Report::Error(Message::CannotReadCurrentSettings());
-    sleep(sl);
+    y2debug("Squid::Read - http_ports: %1",http_ports);
 
-    // detect devices
-    if(Abort()) return false;
-    Progress::NextStage();
     /* Error message */
-    if(false) Report::Warning(_("Cannot detect devices."));
-    sleep(sl);
+    if(!ok) Report::Error(_("Cannot read configuration file."));
 
-    if(Abort()) return false;
-    /* Progress finished */
-    Progress::NextStage();
-    sleep(sl);
+    Progress::NextStep();
 
-    if(Abort()) return false;
-    modified = false;
     return true;
 }
 
@@ -286,3 +314,4 @@
 
 /* EOF */
 }
+/* vim: set sw=4 ts=4 et ft=ycp : */

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org

    

[yast-commit] r39616 - /trunk/squid/src/Squid.ycp

dfiser＠svn.opensuse.org