Changeset 444

Timestamp:

11/04/08 11:01:03 (2 months ago)

Author:

arnaud

Message:

Libs Market à jour

Files:

• trunk/lib/model/map/MarketMapBuilder.php (modified) (3 diffs)
• trunk/lib/model/om/BaseMarket.php (modified) (25 diffs)
• trunk/lib/model/om/BaseMarketPeer.php (modified) (24 diffs)
• trunk/lib/model/om/BaseMarket_nature.php (modified) (1 diff)
• trunk/lib/model/om/BaseMarket_provider.php (modified) (1 diff)
• trunk/lib/model/om/BaseMarket_type.php (modified) (1 diff)

trunk/lib/model/map/MarketMapBuilder.php

@@ -43 +43 @@
-                $tMap->addColumn('AGENCY_CITY', 'AgencyCity', 'string', CreoleTypes::VARCHAR, false, 100);
-
+                $tMap->addColumn('AGENCY_AGENT', 'AgencyAgent', 'string', CreoleTypes::VARCHAR, false, 100);
+
+                $tMap->addColumn('AGENCY_PHONE', 'AgencyPhone', 'string', CreoleTypes::VARCHAR, false, 100);
+
+                $tMap->addColumn('AGENCY_MAIL', 'AgencyMail', 'string', CreoleTypes::VARCHAR, false, 100);
+
-                $tMap->addForeignKey('NATURE_ID', 'NatureId', 'int', CreoleTypes::INTEGER, 'market_nature', 'ID', true, 11);
-
@@ -129 +135 @@
-                $tMap->addColumn('SECTOR', 'Sector', 'string', CreoleTypes::VARCHAR, false, 100);
-
+                $tMap->addForeignKey('DISTRICT_ID', 'DistrictId', 'int', CreoleTypes::INTEGER, 'apidistrict', 'ID', false, 11);
+
-                $tMap->addColumn('ADDRESS1', 'Address1', 'string', CreoleTypes::VARCHAR, false, 100);
-
@@ -190 +198 @@
-
-                $tMap->addColumn('URL', 'Url', 'string', CreoleTypes::VARCHAR, false, 160);
+
+                $tMap->addColumn('LAST_CHANGE', 'LastChange', 'int', CreoleTypes::TIMESTAMP, false, null);
-
-                $tMap->addColumn('CREATED_AT', 'CreatedAt', 'int', CreoleTypes::TIMESTAMP, false, null);

trunk/lib/model/om/BaseMarket.php

@@ -30 +30 @@
-
-        
+        protected $agency_agent;
+
+
+        
+        protected $agency_phone;
+
+
+        
+        protected $agency_mail;
+
+
+        
-        protected $nature_id;
-
@@ -202 +214 @@
-
-        
+        protected $district_id;
+
+
+        
-        protected $address1;
-
@@ -326 +342 @@
-
-        
+        protected $last_change;
+
+
+        
-        protected $created_at;
-
@@ -342 +362 @@
-
-        
+        protected $aApidistrict;
+
+        
-        protected $collPictures;
-
@@ -386 +409 @@
-
-                return $this->agency_city;
+        }
+
+        
+        public function getAgencyAgent()
+        {
+
+                return $this->agency_agent;
+        }
+
+        
+        public function getAgencyPhone()
+        {
+
+                return $this->agency_phone;
+        }
+
+        
+        public function getAgencyMail()
+        {
+
+                return $this->agency_mail;
-        }
-
@@ -750 +794 @@
-
-        
+        public function getDistrictId()
+        {
+
+                return $this->district_id;
+        }
+
+        
-        public function getAddress1()
-        {
@@ -964 +1015 @@
-
-                return $this->url;
+        }
+
+        
+        public function getLastChange($format = 'Y-m-d H:i:s')
+        {
+
+                if ($this->last_change === null || $this->last_change === '') {
+                        return null;
+                } elseif (!is_int($this->last_change)) {
+                                                $ts = strtotime($this->last_change);
+                        if ($ts === -1 || $ts === false) {                              throw new PropelException("Unable to parse value of [last_change] as date/time value: " . var_export($this->last_change, true));
+                        }
+                } else {
+                        $ts = $this->last_change;
+                }
+                if ($format === null) {
+                        return $ts;
+                } elseif (strpos($format, '%') !== false) {
+                        return strftime($format, $ts);
+                } else {
+                        return date($format, $ts);
+                }
-        }
-
@@ -1085 +1158 @@
-        } 
-        
+        public function setAgencyAgent($v)
+        {
+
+                                                if ($v !== null && !is_string($v)) {
+                        $v = (string) $v; 
+                }
+
+                if ($this->agency_agent !== $v) {
+                        $this->agency_agent = $v;
+                        $this->modifiedColumns[] = MarketPeer::AGENCY_AGENT;
+                }
+
+        } 
+        
+        public function setAgencyPhone($v)
+        {
+
+                                                if ($v !== null && !is_string($v)) {
+                        $v = (string) $v; 
+                }
+
+                if ($this->agency_phone !== $v) {
+                        $this->agency_phone = $v;
+                        $this->modifiedColumns[] = MarketPeer::AGENCY_PHONE;
+                }
+
+        } 
+        
+        public function setAgencyMail($v)
+        {
+
+                                                if ($v !== null && !is_string($v)) {
+                        $v = (string) $v; 
+                }
+
+                if ($this->agency_mail !== $v) {
+                        $this->agency_mail = $v;
+                        $this->modifiedColumns[] = MarketPeer::AGENCY_MAIL;
+                }
+
+        } 
+        
-        public function setNatureId($v)
-        {
@@ -1671 +1786 @@
-        } 
-        
+        public function setDistrictId($v)
+        {
+
+                                                if ($v !== null && !is_int($v) && is_numeric($v)) {
+                        $v = (int) $v;
+                }
+
+                if ($this->district_id !== $v) {
+                        $this->district_id = $v;
+                        $this->modifiedColumns[] = MarketPeer::DISTRICT_ID;
+                }
+
+                if ($this->aApidistrict !== null && $this->aApidistrict->getId() !== $v) {
+                        $this->aApidistrict = null;
+                }
+
+        } 
+        
-        public function setAddress1($v)
-        {
@@ -2073 +2206 @@
-                        $this->url = $v;
-                        $this->modifiedColumns[] = MarketPeer::URL;
+                }
+
+        } 
+        
+        public function setLastChange($v)
+        {
+
+                if ($v !== null && !is_int($v)) {
+                        $ts = strtotime($v);
+                        if ($ts === -1 || $ts === false) {                              throw new PropelException("Unable to parse date/time value for [last_change] from input: " . var_export($v, true));
+                        }
+                } else {
+                        $ts = $v;
+                }
+                if ($this->last_change !== $ts) {
+                        $this->last_change = $ts;
+                        $this->modifiedColumns[] = MarketPeer::LAST_CHANGE;
-                }
-
@@ -2125 +2275 @@
-                        $this->agency_city = $rs->getString($startcol + 4);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                        $this->resetModified();
@@ -2281 +2441 @@
-                        $this->setNew(false);
-
-1
+6
-                } catch (Exception $e) {
-                        throw new PropelException("Error populating Market object", $e);
@@ -2368 +2528 @@
-                                }
-                                $this->setMarket_type($this->aMarket_type);
+                        }
+
+                        if ($this->aApidistrict !== null) {
+                                if ($this->aApidistrict->isModified()) {
+                                        $affectedRows += $this->aApidistrict->save($con);
+                                }
+                                $this->setApidistrict($this->aApidistrict);
-                        }
-
@@ -2445 +2612 @@
-                        }
-
+                        if ($this->aApidistrict !== null) {
+                                if (!$this->aApidistrict->validate($columns)) {
+                                        $failureMap = array_merge($failureMap, $this->aApidistrict->getValidationFailures());
+                                }
+                        }
+
-
-                        if (($retval = MarketPeer::doValidate($this, $columns)) !== true) {
@@ -2493 +2666 @@
-                                break;
-                        case 5:
+                                return $this->getAgencyAgent();
+                                break;
+                        case 6:
+                                return $this->getAgencyPhone();
+                                break;
+                        case 7:
+                                return $this->getAgencyMail();
+                                break;
+                        case 8:
-                                return $this->getNatureId();
-                                break;
-6
+9
-                                return $this->getTypeId();
-                                break;
-7
+10
-                                return $this->getActive();
-                                break;
-8
+11
-                                return $this->getExclusivity();
-                                break;
-9
+12
-                                return $this->getMandatNumber();
-                                break;
-0
+3
-                                return $this->getMandatComment();
-                                break;
-1
+4
-                                return $this->getMandatStartDate();
-                                break;
-2
+5
-                                return $this->getMandatEndDate();
-                                break;
-3
+6
-                                return $this->getAvailableDate();
-                                break;
-4
+7
-                                return $this->getCompromise();
-                                break;
-5
+8
-                                return $this->getCompromiseDate();
-                                break;
-6
+9
-                                return $this->getReducedCosts();
-                                break;
-17
+20
-                                return $this->getKeysInAgency();
-                                break;
-18
+21
-                                return $this->getBusy();
-                                break;
-19
+22
-                                return $this->getPrice();
-                                break;
-0
+3
-                                return $this->getLandTax();
-                                break;
-1
+4
-                                return $this->getCosts();
-                                break;
-2
+5
-                                return $this->getAgencyFees();
-                                break;
-3
+6
-                                return $this->getParts();
-                                break;
-4
+7
-                                return $this->getLevel();
-                                break;
-5
+8
-                                return $this->getLevels();
-                                break;
-6
+9
-                                return $this->getLastlevel();
-                                break;
-27
+30
-                                return $this->getPrivateGarden();
-                                break;
-28
+31
-                                return $this->getCaves();
-                                break;
-29
+32
-                                return $this->getCarparks();
-                                break;
-0
+3
-                                return $this->getCarparksOut();
-                                break;
-1
+4
-                                return $this->getCarparksBasement();
-                                break;
-2
+5
-                                return $this->getState();
-                                break;
-3
+6
-                                return $this->getQuiet();
-                                break;
-4
+7
-                                return $this->getExposition();
-                                break;
-5
+8
-                                return $this->getView();
-                                break;
-6
+9
-                                return $this->getKitchen();
-                                break;
-37
+40
-                                return $this->getBathrooms();
-                                break;
-38
+41
-                                return $this->getWcs();
-                                break;
-39
+42
-                                return $this->getRooms();
-                                break;
-0
+3
-                                return $this->getLivingroomSurface();
-                                break;
-1
+4
-                                return $this->getTotalSurface();
-                                break;
-2
+5
-                                return $this->getGardenSurface();
-                                break;
-3
+6
-                                return $this->getTerraceSurface();
-                                break;
-4
+7
-                                return $this->getComment();
-                                break;
-5
+8
-                                return $this->getCommentPrivate();
-                                break;
-6
+9
-                                return $this->getBuilding();
-                                break;
-47
+50
-                                return $this->getSector();
-                                break;
-
+
+
+
+
-                                return $this->getAddress1();
-                                break;
-49
+53
-                                return $this->getAddress2();
-                                break;
-0
+4
-                                return $this->getZipcode();
-                                break;
-1
+5
-                                return $this->getCity();
-                                break;
-2
+6
-                                return $this->getCityInsee();
-                                break;
-3
+7
-                                return $this->getStreetInsee();
-                                break;
-4
+8
-                                return $this->getStandingType();
-                                break;
-5
+9
-                                return $this->getEra();
-                                break;
-56
+60
-                                return $this->getHeadingType();
-                                break;
-57
+61
-                                return $this->getHotWater();
-                                break;
-