From 2e3fe8a5307dfa8cc4dca3476f318dfe5cdc85b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B0=D0=BC=D0=BE=D1=83=D0=BA=D0=B8=D0=BD=20=D0=90?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <asamoukin@asamoukin.local.calculate.ru>
Date: Thu, 10 Sep 2009 10:35:22 +0400
Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=20?=
 =?UTF-8?q?=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1?=
 =?UTF-8?q?=D0=BE=D1=82=D0=BA=D0=B8=20=D0=BF=D0=BE=D0=BB=D0=B5=D0=B9=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=BF=D1=80=D0=BE=D1=84=D0=B8=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=B9=20dhcp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pym/cl_profile.py | 61 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 59 insertions(+), 2 deletions(-)

diff --git a/pym/cl_profile.py b/pym/cl_profile.py
index 9f51ab3..47be839 100644
--- a/pym/cl_profile.py
+++ b/pym/cl_profile.py
@@ -2226,7 +2226,6 @@ class profile(_file, _terms, xmlShare):
             if self._servDir[-1] != "/":
                 self._servDir += "/"
             self._servDir = os.path.split(self._servDir)[0]
-
     # Преобразование восьмеричного в целое (ввод строка, вывод число)
     def __octToInt(self, strOct):
         if strOct:
@@ -6237,4 +6236,62 @@ class dhcp(bind):
     reSeparator = re.compile("[ \t]+")
 
     def __init__(self,text):
-       bind.__init__(self,text)
\ No newline at end of file
+        bind.__init__(self,text)
+
+    def setDataField(self, txtLines, endtxtLines):
+        """Создаем список объектов с переменными"""
+        class fieldData:
+            def __init__(self):
+                self.name = False
+                self.value = False
+                self.comment = False
+                self.br = False
+        fields = []
+        field = fieldData()
+        z = 0
+        for k in txtLines:
+            textLine = k + endtxtLines[z]
+            z += 1
+            findComment = self.reComment.search(textLine)
+            if not textLine.strip():
+                field.br = textLine
+                fields.append(field)
+                field = fieldData()
+            elif findComment:
+                field.comment = textLine
+                fields.append(field)
+                field = fieldData()
+            else:
+                pars = textLine.strip()
+                nameValue = self.reSeparator.split(pars)
+                if len (nameValue) == 1:
+                    field.name = textLine.replace(self.sepFields,"").strip()
+                    field.value = ""
+                    field.br = textLine
+                    fields.append(field)
+                    field = fieldData()
+
+                if len(nameValue) > 2:
+                    if nameValue[0] == "option" or nameValue[0] == "hardware":
+                        valueList = nameValue[2:]
+                        nameValue =[nameValue[0]+nameValue[1],
+                                    " ".join(valueList).replace(\
+                                    self.sepFields,"")]
+                    else:
+                        valueList = nameValue[1:]
+                        nameValue =[nameValue[0]," ".join(valueList).replace(\
+                                                            self.sepFields,"")]
+                if len(nameValue) == 2:
+                    name = nameValue[0]
+                    value = nameValue[1].replace(self.sepFields,"")
+                    field.name = name.replace(" ","").replace("\t","")
+                    field.value = value
+                    field.br = textLine
+                    fields.append(field)
+                    field = fieldData()
+        return fields
+
+    def join(self, dhcpObj):
+        """Объединяем конфигурации"""
+        if isinstance(dhcpObj, dhcp):
+            self.docObj.joinDoc(dhcpObj.doc)