diff --git a/backend/Playlist.php b/backend/Playlist.php index 1f91233e2..34d361637 100644 --- a/backend/Playlist.php +++ b/backend/Playlist.php @@ -63,67 +63,30 @@ class Playlist { public static function Insert($p_values) { - global $CC_CONFIG, $CC_DBC; - - // Create the StoredPlaylist object + // Create the StoredPlaylist object $storedPlaylist = new Playlist(); $storedPlaylist->name = isset($p_values['filename']) ? $p_values['filename'] : date("H:i:s"); + $storedPlaylist->mtime = new DateTime("now"); + + $pl = new CcPlaylist(); + $pl->setDbName($storedPlaylist->name); + $pl->setDbState("incomplete"); + $pl->setDbMtime($storedPlaylist->mtime); + $pl->save(); - // NOTE: POSTGRES-SPECIFIC KEYWORD "DEFAULT" BEING USED, WOULD BE "NULL" IN MYSQL - $storedPlaylist->id = isset($p_values['id']) && is_integer($p_values['id'])?"'".$p_values['id']."'":'DEFAULT'; + $storedPlaylist->id = $pl->getDbId(); + $storedPlaylist->setState('ready'); - // Insert record into the database - $escapedName = pg_escape_string($storedPlaylist->name); - - $CC_DBC->query("BEGIN"); - $sql = "INSERT INTO ".$CC_CONFIG['playListTable'] - ."(id, name, state, mtime)" - ." VALUES ({$storedPlaylist->id}, '{$escapedName}', " - ." 'incomplete', now())"; - - $res = $CC_DBC->query($sql); - if (PEAR::isError($res)) { - $CC_DBC->query("ROLLBACK"); - return $res; - } - - if (!is_integer($storedPlaylist->id)) { - // NOTE: POSTGRES-SPECIFIC - $sql = "SELECT currval('".$CC_CONFIG["playListSequence"]."_seq')"; - $storedPlaylist->id = $CC_DBC->getOne($sql); - } - - // Save state - $res = $storedPlaylist->setState('ready'); - - // Commit changes - $res = $CC_DBC->query("COMMIT"); - if (PEAR::isError($res)) { - $CC_DBC->query("ROLLBACK"); - return $res; - } - - return $storedPlaylist->id; + return $storedPlaylist->id; + } public static function Delete($id) { - global $CC_CONFIG, $CC_DBC; - - $CC_DBC->query("BEGIN"); - $sql = "DELETE FROM ".$CC_CONFIG['playListTable']. " WHERE id='{$id}'"; - - $res = $CC_DBC->query($sql); - if (PEAR::isError($res)) { - $CC_DBC->query("ROLLBACK"); - return $res; - } - - // Commit changes - $res = $CC_DBC->query("COMMIT"); - if (PEAR::isError($res)) { - $CC_DBC->query("ROLLBACK"); - return $res; - } + $pl = CcPlaylistQuery::create()->findPK($id); + if($pl === NULL) + return FALSE; + + $pl->delete(); return TRUE; } @@ -133,37 +96,22 @@ class Playlist { * * @param string $id * DB id of file - * @return Playlist|NULL - * Return NULL if the object doesnt exist in the DB. + * @return Playlist|FALSE + * Return FALSE if the object doesnt exist in the DB. */ public static function Recall($id) { - global $CC_DBC, $CC_CONFIG; + $pl = CcPlaylistQuery::create()->findPK($id); + if($pl === NULL) + return FALSE; - $escapedID = pg_escape_string($id); - - $sql = "SELECT id," - ." name, state, currentlyaccessing, editedby, " - ." mtime" - ." FROM ".$CC_CONFIG['playListTable'] - ." WHERE id ='{$escapedID}'"; - $row = $CC_DBC->getRow($sql); - - if (PEAR::isError($row)) { - return FALSE; - } - if (is_null($row)) { - return FALSE; - } - - $storedPlaylist = new Playlist($id); - - $storedPlaylist->id = $row['id']; - $storedPlaylist->name = $row['name']; - $storedPlaylist->state = $row['state']; - $storedPlaylist->currentlyaccessing = $row['currentlyaccessing']; - $storedPlaylist->editedby = $row['editedby']; - $storedPlaylist->mtime = $row['mtime']; + $storedPlaylist = new Playlist(); + $storedPlaylist->id = $pl->getDbId(); + $storedPlaylist->name = $pl->getDbName(); + $storedPlaylist->state = $pl->getDbState(); + $storedPlaylist->currentlyaccessing = $pl->getDbCurrentlyaccessing(); + $storedPlaylist->editedby = $pl->getDbEditedby(); + $storedPlaylist->mtime = $pl->getDbMtime(); return $storedPlaylist; } @@ -176,15 +124,15 @@ class Playlist { */ public function setName($p_newname) { - global $CC_CONFIG, $CC_DBC; - $escapedName = pg_escape_string($p_newname); - $sql = "UPDATE ".$CC_CONFIG['playListTable'] - ." SET name='$escapedName', mtime=now()" - ." WHERE id='{$this->id}'"; - $res = $CC_DBC->query($sql); - if (PEAR::isError($res)) { - return $res; - } + $pl = CcPlaylistQuery::create()->findPK($this->id); + + if($pl === NULL) + return FALSE; + + $pl->setDbName($p_newname); + $pl->setDbMtime(new DateTime("now")); + $pl->save(); + $this->name = $p_newname; return TRUE; } @@ -198,13 +146,14 @@ class Playlist { */ public function getName($id=NULL) { - global $CC_CONFIG, $CC_DBC; if (is_null($id)) { return $this->name; } - $sql = "SELECT name FROM ".$CC_CONFIG['playListTable'] - ." WHERE id='$id'"; - return $CC_DBC->getOne($sql); + $pl = CcPlaylistQuery::create()->findPK($id); + if($pl === NULL) + return FALSE; + + return $pl->getDbName(); } /** @@ -218,16 +167,19 @@ class Playlist { */ public function setState($p_state, $p_editedby=NULL) { - global $CC_CONFIG, $CC_DBC; - $escapedState = pg_escape_string($p_state); - $eb = (!is_null($p_editedby) ? ", editedBy=$p_editedby" : ''); - $sql = "UPDATE ".$CC_CONFIG['playListTable'] - ." SET state='$escapedState'$eb, mtime=now()" - ." WHERE id='{$this->id}'"; - $res = $CC_DBC->query($sql); - if (PEAR::isError($res)) { - return $res; - } + $pl = CcPlaylistQuery::create()->findPK($this->id); + + if($pl === NULL) + return FALSE; + + $pl->setDbState($p_state); + $pl->setDbMtime(new DateTime("now")); + + $eb = (!is_null($p_editedby) ? $p_editedby : NULL); + $pl->setDbEditedby($eb); + + $pl->save(); + $this->state = $p_state; $this->editedby = $p_editedby; return TRUE; @@ -243,13 +195,15 @@ class Playlist { */ public function getState($id=NULL) { - global $CC_CONFIG, $CC_DBC; if (is_null($id)) { return $this->state; } - $sql = "SELECT state FROM ".$CC_CONFIG['playListTable'] - ." WHERE id='$id'"; - return $CC_DBC->getOne($sql); + + $pl = CcPlaylistQuery::create()->findPK($id); + if($pl === NULL) + return FALSE; + + return $pl->getDbState(); } /** @@ -334,14 +288,13 @@ class Playlist { } } - $state = $this->state; if ($p_val) { $r = $this->setState('edited', $p_subjid); } else { - $r = $this->setState('ready', 'NULL'); + $r = $this->setState('ready'); } - if (PEAR::isError($r)) { - return $r; + if ($r === FALSE) { + return FALSE; } return TRUE; } @@ -356,22 +309,14 @@ class Playlist { } private function getNextPos() { - - global $CC_CONFIG, $CC_DBC; - - $sql = "SELECT MAX(position) AS nextPos - FROM cc_playlistcontents - WHERE playlist_id='{$this->getId()}'"; - - $res = $CC_DBC->getOne($sql); + + $res = CcPlaylistQuery::create() + ->findPK($this->id) + ->computeLastPosition(); if(is_null($res)) return 0; - if(PEAR::isError($res)){ - return $res; - } - return $res + 1; } @@ -476,10 +421,10 @@ class Playlist { * @return true|PEAR_Error * TRUE on success */ - public function addAudioClip($p_id, $p_position=NULL, $p_fadeIn=NULL, $p_fadeOut=NULL, $p_clipLength=NULL, $p_cuein=NULL, $p_cueout=NULL) + public function addAudioClip($ac_id, $p_position=NULL, $p_fadeIn=NULL, $p_fadeOut=NULL, $p_clipLength=NULL, $p_cuein=NULL, $p_cueout=NULL) { //get audio clip. - $ac = StoredFile::Recall($p_id); + $ac = StoredFile::Recall($ac_id); if (is_null($ac) || PEAR::isError($ac)) { return $ac; } @@ -512,8 +457,10 @@ class Playlist { $clipLengthS = $clipLengthS - ($acLengthS - self::playlistTimeToSeconds($p_cueout)); } $p_clipLength = self::secondsToPlaylistTime($clipLengthS); - - $res = $this->insertPlaylistElement($this->getId(), $p_id, $p_position, $p_clipLength, $p_cuein, $p_cueout, $p_fadeIn, $p_fadeOut); + + $_SESSION['debug'] = "Playlist id: " .$this->id."
"; + + $res = $this->insertPlaylistElement($this->id, $ac_id, $p_position, $p_clipLength, $p_cuein, $p_cueout, $p_fadeIn, $p_fadeOut); if (PEAR::isError($res)) { return $res; } @@ -530,29 +477,18 @@ class Playlist { */ public function delAudioClip($pos) { - global $CC_CONFIG, $CC_DBC; - if($pos < 0 || $pos >= $this->getNextPos()) return FALSE; + + $row = CcPlaylistcontentsQuery::create() + ->filterByDbPlaylistId($this->id) + ->filterByDbPosition($pos) + ->find(); - $pos = pg_escape_string($pos); - - $CC_DBC->query("BEGIN"); - $sql = "DELETE FROM ".$CC_CONFIG['playListContentsTable']." WHERE playlist_id='{$this->getId()}' AND position='{$pos}'"; - - $res = $CC_DBC->query($sql); - if (PEAR::isError($res)) { - $CC_DBC->query("ROLLBACK"); - return $res; - } - - // Commit changes - $res = $CC_DBC->query("COMMIT"); - if (PEAR::isError($res)) { - $CC_DBC->query("ROLLBACK"); - return $res; - } + if(is_null($row)) + return FALSE; + $row->delete(); return TRUE; } @@ -844,7 +780,7 @@ class Playlist { { global $CC_CONFIG, $CC_DBC; - $cat = $this->categories[$category]; + $cat = $this->categories[$category]; $sql = "UPDATE ".$CC_CONFIG['playListTable']. " SET {$cat}='{$value}'" . " WHERE id='{$this->getId()}'"; @@ -1282,30 +1218,21 @@ class Playlist { */ private function insertPlaylistElement($plId, $fileId, $pos, $clipLength, $cuein, $cueout, $fadeIn=NULL, $fadeOut=NULL) { - global $CC_CONFIG, $CC_DBC; - if(is_null($fadeIn)) $fadeIn = '00:00:00.000'; if(is_null($fadeOut)) $fadeOut = '00:00:00.000'; - - $CC_DBC->query("BEGIN"); - $sql = "INSERT INTO ".$CC_CONFIG['playListContentsTable'] - . "(playlist_id, file_id, position, cliplength, cuein, cueout, fadein, fadeout)" - . "VALUES ('{$plId}', '{$fileId}', '{$pos}', '{$clipLength}', '{$cuein}', '{$cueout}', '{$fadeIn}', '{$fadeOut}')"; - - $res = $CC_DBC->query($sql); - if (PEAR::isError($res)) { - $CC_DBC->query("ROLLBACK"); - return $res; - } - - // Commit changes - $res = $CC_DBC->query("COMMIT"); - if (PEAR::isError($res)) { - $CC_DBC->query("ROLLBACK"); - return $res; - } + + $row = new CcPlaylistcontents(); + $row->setDbPlaylistId($plId); + $row->setDbFileId($fileId); + $row->setDbPosition($pos); + $row->setDbCliplength($clipLength); + $row->setDbCuein($cuein); + $row->setDbCueout($cueout); + $row->setDbFadein($fadeIn); + $row->setDbFadeout($fadeOut); + $row->save(); return TRUE; } diff --git a/backend/propel-db/build/classes/campcaster/CcPlaylist.php b/backend/propel-db/build/classes/campcaster/CcPlaylist.php index 804e9db78..f0fefc821 100644 --- a/backend/propel-db/build/classes/campcaster/CcPlaylist.php +++ b/backend/propel-db/build/classes/campcaster/CcPlaylist.php @@ -15,4 +15,18 @@ */ class CcPlaylist extends BaseCcPlaylist { + + public function computeLastPosition() + { + $con = Propel::getConnection(CcPlaylistPeer::DATABASE_NAME); + + $sql = 'SELECT MAX('.CcPlaylistcontentsPeer::POSITION.') AS pos' + . ' FROM ' .CcPlaylistcontentsPeer::TABLE_NAME + . ' WHERE ' .CcPlaylistcontentsPeer::PLAYLIST_ID. ' = :p1'; + + $stmt = $con->prepare($sql); + $stmt->bindValue(':p1', $this->getDbId()); + $stmt->execute(); + return $stmt->fetchColumn(); + } } // CcPlaylist diff --git a/backend/propel-db/build/classes/campcaster/map/CcPlaylistTableMap.php b/backend/propel-db/build/classes/campcaster/map/CcPlaylistTableMap.php index 87ca66f84..cfb6f23de 100644 --- a/backend/propel-db/build/classes/campcaster/map/CcPlaylistTableMap.php +++ b/backend/propel-db/build/classes/campcaster/map/CcPlaylistTableMap.php @@ -38,14 +38,14 @@ class CcPlaylistTableMap extends TableMap { $this->setUseIdGenerator(true); $this->setPrimaryKeyMethodInfo('cc_playlist_id_seq'); // columns - $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null); - $this->addColumn('NAME', 'Name', 'VARCHAR', true, 255, ''); - $this->addColumn('STATE', 'State', 'VARCHAR', true, 128, 'empty'); - $this->addColumn('CURRENTLYACCESSING', 'Currentlyaccessing', 'INTEGER', true, null, 0); - $this->addForeignKey('EDITEDBY', 'Editedby', 'INTEGER', 'cc_subjs', 'ID', false, null, null); - $this->addColumn('MTIME', 'Mtime', 'TIMESTAMP', false, 6, null); - $this->addColumn('CREATOR', 'Creator', 'VARCHAR', false, 32, null); - $this->addColumn('DESCRIPTION', 'Description', 'VARCHAR', false, 512, null); + $this->addPrimaryKey('ID', 'DbId', 'INTEGER', true, null, null); + $this->addColumn('NAME', 'DbName', 'VARCHAR', true, 255, ''); + $this->addColumn('STATE', 'DbState', 'VARCHAR', true, 128, 'empty'); + $this->addColumn('CURRENTLYACCESSING', 'DbCurrentlyaccessing', 'INTEGER', true, null, 0); + $this->addForeignKey('EDITEDBY', 'DbEditedby', 'INTEGER', 'cc_subjs', 'ID', false, null, null); + $this->addColumn('MTIME', 'DbMtime', 'TIMESTAMP', false, 6, null); + $this->addColumn('CREATOR', 'DbCreator', 'VARCHAR', false, 32, null); + $this->addColumn('DESCRIPTION', 'DbDescription', 'VARCHAR', false, 512, null); // validators } // initialize() diff --git a/backend/propel-db/build/classes/campcaster/map/CcPlaylistcontentsTableMap.php b/backend/propel-db/build/classes/campcaster/map/CcPlaylistcontentsTableMap.php index b309cb52c..4ce59117e 100644 --- a/backend/propel-db/build/classes/campcaster/map/CcPlaylistcontentsTableMap.php +++ b/backend/propel-db/build/classes/campcaster/map/CcPlaylistcontentsTableMap.php @@ -38,15 +38,15 @@ class CcPlaylistcontentsTableMap extends TableMap { $this->setUseIdGenerator(true); $this->setPrimaryKeyMethodInfo('cc_playlistcontents_id_seq'); // columns - $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null); - $this->addForeignKey('PLAYLIST_ID', 'PlaylistId', 'INTEGER', 'cc_playlist', 'ID', false, null, null); - $this->addForeignKey('FILE_ID', 'FileId', 'INTEGER', 'cc_files', 'ID', false, null, null); - $this->addColumn('POSITION', 'Position', 'INTEGER', false, null, null); - $this->addColumn('CLIPLENGTH', 'Cliplength', 'TIME', false, null, '00:00:00'); - $this->addColumn('CUEIN', 'Cuein', 'TIME', false, null, '00:00:00'); - $this->addColumn('CUEOUT', 'Cueout', 'TIME', false, null, '00:00:00'); - $this->addColumn('FADEIN', 'Fadein', 'TIME', false, null, '00:00:00'); - $this->addColumn('FADEOUT', 'Fadeout', 'TIME', false, null, '00:00:00'); + $this->addPrimaryKey('ID', 'DbId', 'INTEGER', true, null, null); + $this->addForeignKey('PLAYLIST_ID', 'DbPlaylistId', 'INTEGER', 'cc_playlist', 'ID', false, null, null); + $this->addForeignKey('FILE_ID', 'DbFileId', 'INTEGER', 'cc_files', 'ID', false, null, null); + $this->addColumn('POSITION', 'DbPosition', 'INTEGER', false, null, null); + $this->addColumn('CLIPLENGTH', 'DbCliplength', 'TIME', false, null, '00:00:00'); + $this->addColumn('CUEIN', 'DbCuein', 'TIME', false, null, '00:00:00'); + $this->addColumn('CUEOUT', 'DbCueout', 'TIME', false, null, '00:00:00'); + $this->addColumn('FADEIN', 'DbFadein', 'TIME', false, null, '00:00:00'); + $this->addColumn('FADEOUT', 'DbFadeout', 'TIME', false, null, '00:00:00'); // validators } // initialize() diff --git a/backend/propel-db/build/classes/campcaster/om/BaseCcFilesQuery.php b/backend/propel-db/build/classes/campcaster/om/BaseCcFilesQuery.php index 8a204a5ec..44d08561c 100644 --- a/backend/propel-db/build/classes/campcaster/om/BaseCcFilesQuery.php +++ b/backend/propel-db/build/classes/campcaster/om/BaseCcFilesQuery.php @@ -1644,7 +1644,7 @@ abstract class BaseCcFilesQuery extends ModelCriteria public function filterByCcPlaylistcontents($ccPlaylistcontents, $comparison = null) { return $this - ->addUsingAlias(CcFilesPeer::ID, $ccPlaylistcontents->getFileId(), $comparison); + ->addUsingAlias(CcFilesPeer::ID, $ccPlaylistcontents->getDbFileId(), $comparison); } /** diff --git a/backend/propel-db/build/classes/campcaster/om/BaseCcPlaylist.php b/backend/propel-db/build/classes/campcaster/om/BaseCcPlaylist.php index 8a44b3ee3..295060730 100644 --- a/backend/propel-db/build/classes/campcaster/om/BaseCcPlaylist.php +++ b/backend/propel-db/build/classes/campcaster/om/BaseCcPlaylist.php @@ -127,7 +127,7 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent * * @return int */ - public function getId() + public function getDbId() { return $this->id; } @@ -137,7 +137,7 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent * * @return string */ - public function getName() + public function getDbName() { return $this->name; } @@ -147,7 +147,7 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent * * @return string */ - public function getState() + public function getDbState() { return $this->state; } @@ -157,7 +157,7 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent * * @return int */ - public function getCurrentlyaccessing() + public function getDbCurrentlyaccessing() { return $this->currentlyaccessing; } @@ -167,7 +167,7 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent * * @return int */ - public function getEditedby() + public function getDbEditedby() { return $this->editedby; } @@ -181,7 +181,7 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent * @return mixed Formatted date/time value as string or DateTime object (if format is NULL), NULL if column is NULL * @throws PropelException - if unable to parse/validate the date/time value. */ - public function getMtime($format = 'Y-m-d H:i:s') + public function getDbMtime($format = 'Y-m-d H:i:s') { if ($this->mtime === null) { return null; @@ -210,7 +210,7 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent * * @return string */ - public function getCreator() + public function getDbCreator() { return $this->creator; } @@ -220,7 +220,7 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent * * @return string */ - public function getDescription() + public function getDbDescription() { return $this->description; } @@ -231,7 +231,7 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent * @param int $v new value * @return CcPlaylist The current object (for fluent API support) */ - public function setId($v) + public function setDbId($v) { if ($v !== null) { $v = (int) $v; @@ -243,7 +243,7 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent } return $this; - } // setId() + } // setDbId() /** * Set the value of [name] column. @@ -251,7 +251,7 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent * @param string $v new value * @return CcPlaylist The current object (for fluent API support) */ - public function setName($v) + public function setDbName($v) { if ($v !== null) { $v = (string) $v; @@ -263,7 +263,7 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent } return $this; - } // setName() + } // setDbName() /** * Set the value of [state] column. @@ -271,7 +271,7 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent * @param string $v new value * @return CcPlaylist The current object (for fluent API support) */ - public function setState($v) + public function setDbState($v) { if ($v !== null) { $v = (string) $v; @@ -283,7 +283,7 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent } return $this; - } // setState() + } // setDbState() /** * Set the value of [currentlyaccessing] column. @@ -291,7 +291,7 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent * @param int $v new value * @return CcPlaylist The current object (for fluent API support) */ - public function setCurrentlyaccessing($v) + public function setDbCurrentlyaccessing($v) { if ($v !== null) { $v = (int) $v; @@ -303,7 +303,7 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent } return $this; - } // setCurrentlyaccessing() + } // setDbCurrentlyaccessing() /** * Set the value of [editedby] column. @@ -311,7 +311,7 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent * @param int $v new value * @return CcPlaylist The current object (for fluent API support) */ - public function setEditedby($v) + public function setDbEditedby($v) { if ($v !== null) { $v = (int) $v; @@ -327,7 +327,7 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent } return $this; - } // setEditedby() + } // setDbEditedby() /** * Sets the value of [mtime] column to a normalized version of the date/time value specified. @@ -336,7 +336,7 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent * be treated as NULL for temporal objects. * @return CcPlaylist The current object (for fluent API support) */ - public function setMtime($v) + public function setDbMtime($v) { // we treat '' as NULL for temporal objects because DateTime('') == DateTime('now') // -- which is unexpected, to say the least. @@ -376,7 +376,7 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent } // if either are not null return $this; - } // setMtime() + } // setDbMtime() /** * Set the value of [creator] column. @@ -384,7 +384,7 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent * @param string $v new value * @return CcPlaylist The current object (for fluent API support) */ - public function setCreator($v) + public function setDbCreator($v) { if ($v !== null) { $v = (string) $v; @@ -396,7 +396,7 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent } return $this; - } // setCreator() + } // setDbCreator() /** * Set the value of [description] column. @@ -404,7 +404,7 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent * @param string $v new value * @return CcPlaylist The current object (for fluent API support) */ - public function setDescription($v) + public function setDbDescription($v) { if ($v !== null) { $v = (string) $v; @@ -416,7 +416,7 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent } return $this; - } // setDescription() + } // setDbDescription() /** * Indicates whether the columns in this object are only set to default values. @@ -682,7 +682,7 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent $pk = BasePeer::doInsert($criteria, $con); $affectedRows += 1; - $this->setId($pk); //[IMV] update autoincrement primary key + $this->setDbId($pk); //[IMV] update autoincrement primary key $this->setNew(false); } else { $affectedRows += CcPlaylistPeer::doUpdate($this, $con); @@ -824,28 +824,28 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent { switch($pos) { case 0: - return $this->getId(); + return $this->getDbId(); break; case 1: - return $this->getName(); + return $this->getDbName(); break; case 2: - return $this->getState(); + return $this->getDbState(); break; case 3: - return $this->getCurrentlyaccessing(); + return $this->getDbCurrentlyaccessing(); break; case 4: - return $this->getEditedby(); + return $this->getDbEditedby(); break; case 5: - return $this->getMtime(); + return $this->getDbMtime(); break; case 6: - return $this->getCreator(); + return $this->getDbCreator(); break; case 7: - return $this->getDescription(); + return $this->getDbDescription(); break; default: return null; @@ -871,14 +871,14 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent { $keys = CcPlaylistPeer::getFieldNames($keyType); $result = array( - $keys[0] => $this->getId(), - $keys[1] => $this->getName(), - $keys[2] => $this->getState(), - $keys[3] => $this->getCurrentlyaccessing(), - $keys[4] => $this->getEditedby(), - $keys[5] => $this->getMtime(), - $keys[6] => $this->getCreator(), - $keys[7] => $this->getDescription(), + $keys[0] => $this->getDbId(), + $keys[1] => $this->getDbName(), + $keys[2] => $this->getDbState(), + $keys[3] => $this->getDbCurrentlyaccessing(), + $keys[4] => $this->getDbEditedby(), + $keys[5] => $this->getDbMtime(), + $keys[6] => $this->getDbCreator(), + $keys[7] => $this->getDbDescription(), ); if ($includeForeignObjects) { if (null !== $this->aCcSubjs) { @@ -916,28 +916,28 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent { switch($pos) { case 0: - $this->setId($value); + $this->setDbId($value); break; case 1: - $this->setName($value); + $this->setDbName($value); break; case 2: - $this->setState($value); + $this->setDbState($value); break; case 3: - $this->setCurrentlyaccessing($value); + $this->setDbCurrentlyaccessing($value); break; case 4: - $this->setEditedby($value); + $this->setDbEditedby($value); break; case 5: - $this->setMtime($value); + $this->setDbMtime($value); break; case 6: - $this->setCreator($value); + $this->setDbCreator($value); break; case 7: - $this->setDescription($value); + $this->setDbDescription($value); break; } // switch() } @@ -963,14 +963,14 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent { $keys = CcPlaylistPeer::getFieldNames($keyType); - if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]); - if (array_key_exists($keys[1], $arr)) $this->setName($arr[$keys[1]]); - if (array_key_exists($keys[2], $arr)) $this->setState($arr[$keys[2]]); - if (array_key_exists($keys[3], $arr)) $this->setCurrentlyaccessing($arr[$keys[3]]); - if (array_key_exists($keys[4], $arr)) $this->setEditedby($arr[$keys[4]]); - if (array_key_exists($keys[5], $arr)) $this->setMtime($arr[$keys[5]]); - if (array_key_exists($keys[6], $arr)) $this->setCreator($arr[$keys[6]]); - if (array_key_exists($keys[7], $arr)) $this->setDescription($arr[$keys[7]]); + if (array_key_exists($keys[0], $arr)) $this->setDbId($arr[$keys[0]]); + if (array_key_exists($keys[1], $arr)) $this->setDbName($arr[$keys[1]]); + if (array_key_exists($keys[2], $arr)) $this->setDbState($arr[$keys[2]]); + if (array_key_exists($keys[3], $arr)) $this->setDbCurrentlyaccessing($arr[$keys[3]]); + if (array_key_exists($keys[4], $arr)) $this->setDbEditedby($arr[$keys[4]]); + if (array_key_exists($keys[5], $arr)) $this->setDbMtime($arr[$keys[5]]); + if (array_key_exists($keys[6], $arr)) $this->setDbCreator($arr[$keys[6]]); + if (array_key_exists($keys[7], $arr)) $this->setDbDescription($arr[$keys[7]]); } /** @@ -1016,7 +1016,7 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent */ public function getPrimaryKey() { - return $this->getId(); + return $this->getDbId(); } /** @@ -1027,7 +1027,7 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent */ public function setPrimaryKey($key) { - $this->setId($key); + $this->setDbId($key); } /** @@ -1036,7 +1036,7 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent */ public function isPrimaryKeyNull() { - return null === $this->getId(); + return null === $this->getDbId(); } /** @@ -1051,13 +1051,13 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent */ public function copyInto($copyObj, $deepCopy = false) { - $copyObj->setName($this->name); - $copyObj->setState($this->state); - $copyObj->setCurrentlyaccessing($this->currentlyaccessing); - $copyObj->setEditedby($this->editedby); - $copyObj->setMtime($this->mtime); - $copyObj->setCreator($this->creator); - $copyObj->setDescription($this->description); + $copyObj->setDbName($this->name); + $copyObj->setDbState($this->state); + $copyObj->setDbCurrentlyaccessing($this->currentlyaccessing); + $copyObj->setDbEditedby($this->editedby); + $copyObj->setDbMtime($this->mtime); + $copyObj->setDbCreator($this->creator); + $copyObj->setDbDescription($this->description); if ($deepCopy) { // important: temporarily setNew(false) because this affects the behavior of @@ -1074,7 +1074,7 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent $copyObj->setNew(true); - $copyObj->setId(NULL); // this is a auto-increment column, so set to default value + $copyObj->setDbId(NULL); // this is a auto-increment column, so set to default value } /** @@ -1125,9 +1125,9 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent public function setCcSubjs(CcSubjs $v = null) { if ($v === null) { - $this->setEditedby(NULL); + $this->setDbEditedby(NULL); } else { - $this->setEditedby($v->getId()); + $this->setDbEditedby($v->getId()); } $this->aCcSubjs = $v; diff --git a/backend/propel-db/build/classes/campcaster/om/BaseCcPlaylistPeer.php b/backend/propel-db/build/classes/campcaster/om/BaseCcPlaylistPeer.php index 7b297491d..04ff4a612 100644 --- a/backend/propel-db/build/classes/campcaster/om/BaseCcPlaylistPeer.php +++ b/backend/propel-db/build/classes/campcaster/om/BaseCcPlaylistPeer.php @@ -71,8 +71,8 @@ abstract class BaseCcPlaylistPeer { * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('Id', 'Name', 'State', 'Currentlyaccessing', 'Editedby', 'Mtime', 'Creator', 'Description', ), - BasePeer::TYPE_STUDLYPHPNAME => array ('id', 'name', 'state', 'currentlyaccessing', 'editedby', 'mtime', 'creator', 'description', ), + BasePeer::TYPE_PHPNAME => array ('DbId', 'DbName', 'DbState', 'DbCurrentlyaccessing', 'DbEditedby', 'DbMtime', 'DbCreator', 'DbDescription', ), + BasePeer::TYPE_STUDLYPHPNAME => array ('dbId', 'dbName', 'dbState', 'dbCurrentlyaccessing', 'dbEditedby', 'dbMtime', 'dbCreator', 'dbDescription', ), BasePeer::TYPE_COLNAME => array (self::ID, self::NAME, self::STATE, self::CURRENTLYACCESSING, self::EDITEDBY, self::MTIME, self::CREATOR, self::DESCRIPTION, ), BasePeer::TYPE_RAW_COLNAME => array ('ID', 'NAME', 'STATE', 'CURRENTLYACCESSING', 'EDITEDBY', 'MTIME', 'CREATOR', 'DESCRIPTION', ), BasePeer::TYPE_FIELDNAME => array ('id', 'name', 'state', 'currentlyaccessing', 'editedby', 'mtime', 'creator', 'description', ), @@ -86,8 +86,8 @@ abstract class BaseCcPlaylistPeer { * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('Id' => 0, 'Name' => 1, 'State' => 2, 'Currentlyaccessing' => 3, 'Editedby' => 4, 'Mtime' => 5, 'Creator' => 6, 'Description' => 7, ), - BasePeer::TYPE_STUDLYPHPNAME => array ('id' => 0, 'name' => 1, 'state' => 2, 'currentlyaccessing' => 3, 'editedby' => 4, 'mtime' => 5, 'creator' => 6, 'description' => 7, ), + BasePeer::TYPE_PHPNAME => array ('DbId' => 0, 'DbName' => 1, 'DbState' => 2, 'DbCurrentlyaccessing' => 3, 'DbEditedby' => 4, 'DbMtime' => 5, 'DbCreator' => 6, 'DbDescription' => 7, ), + BasePeer::TYPE_STUDLYPHPNAME => array ('dbId' => 0, 'dbName' => 1, 'dbState' => 2, 'dbCurrentlyaccessing' => 3, 'dbEditedby' => 4, 'dbMtime' => 5, 'dbCreator' => 6, 'dbDescription' => 7, ), BasePeer::TYPE_COLNAME => array (self::ID => 0, self::NAME => 1, self::STATE => 2, self::CURRENTLYACCESSING => 3, self::EDITEDBY => 4, self::MTIME => 5, self::CREATOR => 6, self::DESCRIPTION => 7, ), BasePeer::TYPE_RAW_COLNAME => array ('ID' => 0, 'NAME' => 1, 'STATE' => 2, 'CURRENTLYACCESSING' => 3, 'EDITEDBY' => 4, 'MTIME' => 5, 'CREATOR' => 6, 'DESCRIPTION' => 7, ), BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'name' => 1, 'state' => 2, 'currentlyaccessing' => 3, 'editedby' => 4, 'mtime' => 5, 'creator' => 6, 'description' => 7, ), @@ -304,7 +304,7 @@ abstract class BaseCcPlaylistPeer { { if (Propel::isInstancePoolingEnabled()) { if ($key === null) { - $key = (string) $obj->getId(); + $key = (string) $obj->getDbId(); } // if key === null self::$instances[$key] = $obj; } @@ -324,7 +324,7 @@ abstract class BaseCcPlaylistPeer { { if (Propel::isInstancePoolingEnabled() && $value !== null) { if (is_object($value) && $value instanceof CcPlaylist) { - $key = (string) $value->getId(); + $key = (string) $value->getDbId(); } elseif (is_scalar($value)) { // assume we've been passed a primary key $key = (string) $value; diff --git a/backend/propel-db/build/classes/campcaster/om/BaseCcPlaylistQuery.php b/backend/propel-db/build/classes/campcaster/om/BaseCcPlaylistQuery.php index 21742a2a5..237be4312 100644 --- a/backend/propel-db/build/classes/campcaster/om/BaseCcPlaylistQuery.php +++ b/backend/propel-db/build/classes/campcaster/om/BaseCcPlaylistQuery.php @@ -6,23 +6,23 @@ * * * - * @method CcPlaylistQuery orderById($order = Criteria::ASC) Order by the id column - * @method CcPlaylistQuery orderByName($order = Criteria::ASC) Order by the name column - * @method CcPlaylistQuery orderByState($order = Criteria::ASC) Order by the state column - * @method CcPlaylistQuery orderByCurrentlyaccessing($order = Criteria::ASC) Order by the currentlyaccessing column - * @method CcPlaylistQuery orderByEditedby($order = Criteria::ASC) Order by the editedby column - * @method CcPlaylistQuery orderByMtime($order = Criteria::ASC) Order by the mtime column - * @method CcPlaylistQuery orderByCreator($order = Criteria::ASC) Order by the creator column - * @method CcPlaylistQuery orderByDescription($order = Criteria::ASC) Order by the description column + * @method CcPlaylistQuery orderByDbId($order = Criteria::ASC) Order by the id column + * @method CcPlaylistQuery orderByDbName($order = Criteria::ASC) Order by the name column + * @method CcPlaylistQuery orderByDbState($order = Criteria::ASC) Order by the state column + * @method CcPlaylistQuery orderByDbCurrentlyaccessing($order = Criteria::ASC) Order by the currentlyaccessing column + * @method CcPlaylistQuery orderByDbEditedby($order = Criteria::ASC) Order by the editedby column + * @method CcPlaylistQuery orderByDbMtime($order = Criteria::ASC) Order by the mtime column + * @method CcPlaylistQuery orderByDbCreator($order = Criteria::ASC) Order by the creator column + * @method CcPlaylistQuery orderByDbDescription($order = Criteria::ASC) Order by the description column * - * @method CcPlaylistQuery groupById() Group by the id column - * @method CcPlaylistQuery groupByName() Group by the name column - * @method CcPlaylistQuery groupByState() Group by the state column - * @method CcPlaylistQuery groupByCurrentlyaccessing() Group by the currentlyaccessing column - * @method CcPlaylistQuery groupByEditedby() Group by the editedby column - * @method CcPlaylistQuery groupByMtime() Group by the mtime column - * @method CcPlaylistQuery groupByCreator() Group by the creator column - * @method CcPlaylistQuery groupByDescription() Group by the description column + * @method CcPlaylistQuery groupByDbId() Group by the id column + * @method CcPlaylistQuery groupByDbName() Group by the name column + * @method CcPlaylistQuery groupByDbState() Group by the state column + * @method CcPlaylistQuery groupByDbCurrentlyaccessing() Group by the currentlyaccessing column + * @method CcPlaylistQuery groupByDbEditedby() Group by the editedby column + * @method CcPlaylistQuery groupByDbMtime() Group by the mtime column + * @method CcPlaylistQuery groupByDbCreator() Group by the creator column + * @method CcPlaylistQuery groupByDbDescription() Group by the description column * * @method CcPlaylistQuery leftJoin($relation) Adds a LEFT JOIN clause to the query * @method CcPlaylistQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query @@ -39,23 +39,23 @@ * @method CcPlaylist findOne(PropelPDO $con = null) Return the first CcPlaylist matching the query * @method CcPlaylist findOneOrCreate(PropelPDO $con = null) Return the first CcPlaylist matching the query, or a new CcPlaylist object populated from the query conditions when no match is found * - * @method CcPlaylist findOneById(int $id) Return the first CcPlaylist filtered by the id column - * @method CcPlaylist findOneByName(string $name) Return the first CcPlaylist filtered by the name column - * @method CcPlaylist findOneByState(string $state) Return the first CcPlaylist filtered by the state column - * @method CcPlaylist findOneByCurrentlyaccessing(int $currentlyaccessing) Return the first CcPlaylist filtered by the currentlyaccessing column - * @method CcPlaylist findOneByEditedby(int $editedby) Return the first CcPlaylist filtered by the editedby column - * @method CcPlaylist findOneByMtime(string $mtime) Return the first CcPlaylist filtered by the mtime column - * @method CcPlaylist findOneByCreator(string $creator) Return the first CcPlaylist filtered by the creator column - * @method CcPlaylist findOneByDescription(string $description) Return the first CcPlaylist filtered by the description column + * @method CcPlaylist findOneByDbId(int $id) Return the first CcPlaylist filtered by the id column + * @method CcPlaylist findOneByDbName(string $name) Return the first CcPlaylist filtered by the name column + * @method CcPlaylist findOneByDbState(string $state) Return the first CcPlaylist filtered by the state column + * @method CcPlaylist findOneByDbCurrentlyaccessing(int $currentlyaccessing) Return the first CcPlaylist filtered by the currentlyaccessing column + * @method CcPlaylist findOneByDbEditedby(int $editedby) Return the first CcPlaylist filtered by the editedby column + * @method CcPlaylist findOneByDbMtime(string $mtime) Return the first CcPlaylist filtered by the mtime column + * @method CcPlaylist findOneByDbCreator(string $creator) Return the first CcPlaylist filtered by the creator column + * @method CcPlaylist findOneByDbDescription(string $description) Return the first CcPlaylist filtered by the description column * - * @method array findById(int $id) Return CcPlaylist objects filtered by the id column - * @method array findByName(string $name) Return CcPlaylist objects filtered by the name column - * @method array findByState(string $state) Return CcPlaylist objects filtered by the state column - * @method array findByCurrentlyaccessing(int $currentlyaccessing) Return CcPlaylist objects filtered by the currentlyaccessing column - * @method array findByEditedby(int $editedby) Return CcPlaylist objects filtered by the editedby column - * @method array findByMtime(string $mtime) Return CcPlaylist objects filtered by the mtime column - * @method array findByCreator(string $creator) Return CcPlaylist objects filtered by the creator column - * @method array findByDescription(string $description) Return CcPlaylist objects filtered by the description column + * @method array findByDbId(int $id) Return CcPlaylist objects filtered by the id column + * @method array findByDbName(string $name) Return CcPlaylist objects filtered by the name column + * @method array findByDbState(string $state) Return CcPlaylist objects filtered by the state column + * @method array findByDbCurrentlyaccessing(int $currentlyaccessing) Return CcPlaylist objects filtered by the currentlyaccessing column + * @method array findByDbEditedby(int $editedby) Return CcPlaylist objects filtered by the editedby column + * @method array findByDbMtime(string $mtime) Return CcPlaylist objects filtered by the mtime column + * @method array findByDbCreator(string $creator) Return CcPlaylist objects filtered by the creator column + * @method array findByDbDescription(string $description) Return CcPlaylist objects filtered by the description column * * @package propel.generator.campcaster.om */ @@ -168,83 +168,83 @@ abstract class BaseCcPlaylistQuery extends ModelCriteria /** * Filter the query on the id column * - * @param int|array $id The value to use as filter. + * @param int|array $dbId The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return CcPlaylistQuery The current query, for fluid interface */ - public function filterById($id = null, $comparison = null) + public function filterByDbId($dbId = null, $comparison = null) { - if (is_array($id) && null === $comparison) { + if (is_array($dbId) && null === $comparison) { $comparison = Criteria::IN; } - return $this->addUsingAlias(CcPlaylistPeer::ID, $id, $comparison); + return $this->addUsingAlias(CcPlaylistPeer::ID, $dbId, $comparison); } /** * Filter the query on the name column * - * @param string $name The value to use as filter. + * @param string $dbName The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return CcPlaylistQuery The current query, for fluid interface */ - public function filterByName($name = null, $comparison = null) + public function filterByDbName($dbName = null, $comparison = null) { if (null === $comparison) { - if (is_array($name)) { + if (is_array($dbName)) { $comparison = Criteria::IN; - } elseif (preg_match('/[\%\*]/', $name)) { - $name = str_replace('*', '%', $name); + } elseif (preg_match('/[\%\*]/', $dbName)) { + $dbName = str_replace('*', '%', $dbName); $comparison = Criteria::LIKE; } } - return $this->addUsingAlias(CcPlaylistPeer::NAME, $name, $comparison); + return $this->addUsingAlias(CcPlaylistPeer::NAME, $dbName, $comparison); } /** * Filter the query on the state column * - * @param string $state The value to use as filter. + * @param string $dbState The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return CcPlaylistQuery The current query, for fluid interface */ - public function filterByState($state = null, $comparison = null) + public function filterByDbState($dbState = null, $comparison = null) { if (null === $comparison) { - if (is_array($state)) { + if (is_array($dbState)) { $comparison = Criteria::IN; - } elseif (preg_match('/[\%\*]/', $state)) { - $state = str_replace('*', '%', $state); + } elseif (preg_match('/[\%\*]/', $dbState)) { + $dbState = str_replace('*', '%', $dbState); $comparison = Criteria::LIKE; } } - return $this->addUsingAlias(CcPlaylistPeer::STATE, $state, $comparison); + return $this->addUsingAlias(CcPlaylistPeer::STATE, $dbState, $comparison); } /** * Filter the query on the currentlyaccessing column * - * @param int|array $currentlyaccessing The value to use as filter. + * @param int|array $dbCurrentlyaccessing The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return CcPlaylistQuery The current query, for fluid interface */ - public function filterByCurrentlyaccessing($currentlyaccessing = null, $comparison = null) + public function filterByDbCurrentlyaccessing($dbCurrentlyaccessing = null, $comparison = null) { - if (is_array($currentlyaccessing)) { + if (is_array($dbCurrentlyaccessing)) { $useMinMax = false; - if (isset($currentlyaccessing['min'])) { - $this->addUsingAlias(CcPlaylistPeer::CURRENTLYACCESSING, $currentlyaccessing['min'], Criteria::GREATER_EQUAL); + if (isset($dbCurrentlyaccessing['min'])) { + $this->addUsingAlias(CcPlaylistPeer::CURRENTLYACCESSING, $dbCurrentlyaccessing['min'], Criteria::GREATER_EQUAL); $useMinMax = true; } - if (isset($currentlyaccessing['max'])) { - $this->addUsingAlias(CcPlaylistPeer::CURRENTLYACCESSING, $currentlyaccessing['max'], Criteria::LESS_EQUAL); + if (isset($dbCurrentlyaccessing['max'])) { + $this->addUsingAlias(CcPlaylistPeer::CURRENTLYACCESSING, $dbCurrentlyaccessing['max'], Criteria::LESS_EQUAL); $useMinMax = true; } if ($useMinMax) { @@ -254,28 +254,28 @@ abstract class BaseCcPlaylistQuery extends ModelCriteria $comparison = Criteria::IN; } } - return $this->addUsingAlias(CcPlaylistPeer::CURRENTLYACCESSING, $currentlyaccessing, $comparison); + return $this->addUsingAlias(CcPlaylistPeer::CURRENTLYACCESSING, $dbCurrentlyaccessing, $comparison); } /** * Filter the query on the editedby column * - * @param int|array $editedby The value to use as filter. + * @param int|array $dbEditedby The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return CcPlaylistQuery The current query, for fluid interface */ - public function filterByEditedby($editedby = null, $comparison = null) + public function filterByDbEditedby($dbEditedby = null, $comparison = null) { - if (is_array($editedby)) { + if (is_array($dbEditedby)) { $useMinMax = false; - if (isset($editedby['min'])) { - $this->addUsingAlias(CcPlaylistPeer::EDITEDBY, $editedby['min'], Criteria::GREATER_EQUAL); + if (isset($dbEditedby['min'])) { + $this->addUsingAlias(CcPlaylistPeer::EDITEDBY, $dbEditedby['min'], Criteria::GREATER_EQUAL); $useMinMax = true; } - if (isset($editedby['max'])) { - $this->addUsingAlias(CcPlaylistPeer::EDITEDBY, $editedby['max'], Criteria::LESS_EQUAL); + if (isset($dbEditedby['max'])) { + $this->addUsingAlias(CcPlaylistPeer::EDITEDBY, $dbEditedby['max'], Criteria::LESS_EQUAL); $useMinMax = true; } if ($useMinMax) { @@ -285,28 +285,28 @@ abstract class BaseCcPlaylistQuery extends ModelCriteria $comparison = Criteria::IN; } } - return $this->addUsingAlias(CcPlaylistPeer::EDITEDBY, $editedby, $comparison); + return $this->addUsingAlias(CcPlaylistPeer::EDITEDBY, $dbEditedby, $comparison); } /** * Filter the query on the mtime column * - * @param string|array $mtime The value to use as filter. + * @param string|array $dbMtime The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return CcPlaylistQuery The current query, for fluid interface */ - public function filterByMtime($mtime = null, $comparison = null) + public function filterByDbMtime($dbMtime = null, $comparison = null) { - if (is_array($mtime)) { + if (is_array($dbMtime)) { $useMinMax = false; - if (isset($mtime['min'])) { - $this->addUsingAlias(CcPlaylistPeer::MTIME, $mtime['min'], Criteria::GREATER_EQUAL); + if (isset($dbMtime['min'])) { + $this->addUsingAlias(CcPlaylistPeer::MTIME, $dbMtime['min'], Criteria::GREATER_EQUAL); $useMinMax = true; } - if (isset($mtime['max'])) { - $this->addUsingAlias(CcPlaylistPeer::MTIME, $mtime['max'], Criteria::LESS_EQUAL); + if (isset($dbMtime['max'])) { + $this->addUsingAlias(CcPlaylistPeer::MTIME, $dbMtime['max'], Criteria::LESS_EQUAL); $useMinMax = true; } if ($useMinMax) { @@ -316,51 +316,51 @@ abstract class BaseCcPlaylistQuery extends ModelCriteria $comparison = Criteria::IN; } } - return $this->addUsingAlias(CcPlaylistPeer::MTIME, $mtime, $comparison); + return $this->addUsingAlias(CcPlaylistPeer::MTIME, $dbMtime, $comparison); } /** * Filter the query on the creator column * - * @param string $creator The value to use as filter. + * @param string $dbCreator The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return CcPlaylistQuery The current query, for fluid interface */ - public function filterByCreator($creator = null, $comparison = null) + public function filterByDbCreator($dbCreator = null, $comparison = null) { if (null === $comparison) { - if (is_array($creator)) { + if (is_array($dbCreator)) { $comparison = Criteria::IN; - } elseif (preg_match('/[\%\*]/', $creator)) { - $creator = str_replace('*', '%', $creator); + } elseif (preg_match('/[\%\*]/', $dbCreator)) { + $dbCreator = str_replace('*', '%', $dbCreator); $comparison = Criteria::LIKE; } } - return $this->addUsingAlias(CcPlaylistPeer::CREATOR, $creator, $comparison); + return $this->addUsingAlias(CcPlaylistPeer::CREATOR, $dbCreator, $comparison); } /** * Filter the query on the description column * - * @param string $description The value to use as filter. + * @param string $dbDescription The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return CcPlaylistQuery The current query, for fluid interface */ - public function filterByDescription($description = null, $comparison = null) + public function filterByDbDescription($dbDescription = null, $comparison = null) { if (null === $comparison) { - if (is_array($description)) { + if (is_array($dbDescription)) { $comparison = Criteria::IN; - } elseif (preg_match('/[\%\*]/', $description)) { - $description = str_replace('*', '%', $description); + } elseif (preg_match('/[\%\*]/', $dbDescription)) { + $dbDescription = str_replace('*', '%', $dbDescription); $comparison = Criteria::LIKE; } } - return $this->addUsingAlias(CcPlaylistPeer::DESCRIPTION, $description, $comparison); + return $this->addUsingAlias(CcPlaylistPeer::DESCRIPTION, $dbDescription, $comparison); } /** @@ -438,7 +438,7 @@ abstract class BaseCcPlaylistQuery extends ModelCriteria public function filterByCcPlaylistcontents($ccPlaylistcontents, $comparison = null) { return $this - ->addUsingAlias(CcPlaylistPeer::ID, $ccPlaylistcontents->getPlaylistId(), $comparison); + ->addUsingAlias(CcPlaylistPeer::ID, $ccPlaylistcontents->getDbPlaylistId(), $comparison); } /** @@ -501,7 +501,7 @@ abstract class BaseCcPlaylistQuery extends ModelCriteria public function prune($ccPlaylist = null) { if ($ccPlaylist) { - $this->addUsingAlias(CcPlaylistPeer::ID, $ccPlaylist->getId(), Criteria::NOT_EQUAL); + $this->addUsingAlias(CcPlaylistPeer::ID, $ccPlaylist->getDbId(), Criteria::NOT_EQUAL); } return $this; diff --git a/backend/propel-db/build/classes/campcaster/om/BaseCcPlaylistcontents.php b/backend/propel-db/build/classes/campcaster/om/BaseCcPlaylistcontents.php index 31591b5ab..87165f312 100644 --- a/backend/propel-db/build/classes/campcaster/om/BaseCcPlaylistcontents.php +++ b/backend/propel-db/build/classes/campcaster/om/BaseCcPlaylistcontents.php @@ -137,7 +137,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent * * @return int */ - public function getId() + public function getDbId() { return $this->id; } @@ -147,7 +147,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent * * @return int */ - public function getPlaylistId() + public function getDbPlaylistId() { return $this->playlist_id; } @@ -157,7 +157,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent * * @return int */ - public function getFileId() + public function getDbFileId() { return $this->file_id; } @@ -167,7 +167,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent * * @return int */ - public function getPosition() + public function getDbPosition() { return $this->position; } @@ -181,7 +181,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent * @return mixed Formatted date/time value as string or DateTime object (if format is NULL), NULL if column is NULL * @throws PropelException - if unable to parse/validate the date/time value. */ - public function getCliplength($format = '%X') + public function getDbCliplength($format = '%X') { if ($this->cliplength === null) { return null; @@ -214,7 +214,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent * @return mixed Formatted date/time value as string or DateTime object (if format is NULL), NULL if column is NULL * @throws PropelException - if unable to parse/validate the date/time value. */ - public function getCuein($format = '%X') + public function getDbCuein($format = '%X') { if ($this->cuein === null) { return null; @@ -247,7 +247,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent * @return mixed Formatted date/time value as string or DateTime object (if format is NULL), NULL if column is NULL * @throws PropelException - if unable to parse/validate the date/time value. */ - public function getCueout($format = '%X') + public function getDbCueout($format = '%X') { if ($this->cueout === null) { return null; @@ -280,7 +280,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent * @return mixed Formatted date/time value as string or DateTime object (if format is NULL), NULL if column is NULL * @throws PropelException - if unable to parse/validate the date/time value. */ - public function getFadein($format = '%X') + public function getDbFadein($format = '%X') { if ($this->fadein === null) { return null; @@ -313,7 +313,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent * @return mixed Formatted date/time value as string or DateTime object (if format is NULL), NULL if column is NULL * @throws PropelException - if unable to parse/validate the date/time value. */ - public function getFadeout($format = '%X') + public function getDbFadeout($format = '%X') { if ($this->fadeout === null) { return null; @@ -343,7 +343,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent * @param int $v new value * @return CcPlaylistcontents The current object (for fluent API support) */ - public function setId($v) + public function setDbId($v) { if ($v !== null) { $v = (int) $v; @@ -355,7 +355,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent } return $this; - } // setId() + } // setDbId() /** * Set the value of [playlist_id] column. @@ -363,7 +363,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent * @param int $v new value * @return CcPlaylistcontents The current object (for fluent API support) */ - public function setPlaylistId($v) + public function setDbPlaylistId($v) { if ($v !== null) { $v = (int) $v; @@ -374,12 +374,12 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent $this->modifiedColumns[] = CcPlaylistcontentsPeer::PLAYLIST_ID; } - if ($this->aCcPlaylist !== null && $this->aCcPlaylist->getId() !== $v) { + if ($this->aCcPlaylist !== null && $this->aCcPlaylist->getDbId() !== $v) { $this->aCcPlaylist = null; } return $this; - } // setPlaylistId() + } // setDbPlaylistId() /** * Set the value of [file_id] column. @@ -387,7 +387,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent * @param int $v new value * @return CcPlaylistcontents The current object (for fluent API support) */ - public function setFileId($v) + public function setDbFileId($v) { if ($v !== null) { $v = (int) $v; @@ -403,7 +403,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent } return $this; - } // setFileId() + } // setDbFileId() /** * Set the value of [position] column. @@ -411,7 +411,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent * @param int $v new value * @return CcPlaylistcontents The current object (for fluent API support) */ - public function setPosition($v) + public function setDbPosition($v) { if ($v !== null) { $v = (int) $v; @@ -423,7 +423,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent } return $this; - } // setPosition() + } // setDbPosition() /** * Sets the value of [cliplength] column to a normalized version of the date/time value specified. @@ -432,7 +432,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent * be treated as NULL for temporal objects. * @return CcPlaylistcontents The current object (for fluent API support) */ - public function setCliplength($v) + public function setDbCliplength($v) { // we treat '' as NULL for temporal objects because DateTime('') == DateTime('now') // -- which is unexpected, to say the least. @@ -473,7 +473,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent } // if either are not null return $this; - } // setCliplength() + } // setDbCliplength() /** * Sets the value of [cuein] column to a normalized version of the date/time value specified. @@ -482,7 +482,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent * be treated as NULL for temporal objects. * @return CcPlaylistcontents The current object (for fluent API support) */ - public function setCuein($v) + public function setDbCuein($v) { // we treat '' as NULL for temporal objects because DateTime('') == DateTime('now') // -- which is unexpected, to say the least. @@ -523,7 +523,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent } // if either are not null return $this; - } // setCuein() + } // setDbCuein() /** * Sets the value of [cueout] column to a normalized version of the date/time value specified. @@ -532,7 +532,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent * be treated as NULL for temporal objects. * @return CcPlaylistcontents The current object (for fluent API support) */ - public function setCueout($v) + public function setDbCueout($v) { // we treat '' as NULL for temporal objects because DateTime('') == DateTime('now') // -- which is unexpected, to say the least. @@ -573,7 +573,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent } // if either are not null return $this; - } // setCueout() + } // setDbCueout() /** * Sets the value of [fadein] column to a normalized version of the date/time value specified. @@ -582,7 +582,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent * be treated as NULL for temporal objects. * @return CcPlaylistcontents The current object (for fluent API support) */ - public function setFadein($v) + public function setDbFadein($v) { // we treat '' as NULL for temporal objects because DateTime('') == DateTime('now') // -- which is unexpected, to say the least. @@ -623,7 +623,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent } // if either are not null return $this; - } // setFadein() + } // setDbFadein() /** * Sets the value of [fadeout] column to a normalized version of the date/time value specified. @@ -632,7 +632,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent * be treated as NULL for temporal objects. * @return CcPlaylistcontents The current object (for fluent API support) */ - public function setFadeout($v) + public function setDbFadeout($v) { // we treat '' as NULL for temporal objects because DateTime('') == DateTime('now') // -- which is unexpected, to say the least. @@ -673,7 +673,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent } // if either are not null return $this; - } // setFadeout() + } // setDbFadeout() /** * Indicates whether the columns in this object are only set to default values. @@ -767,7 +767,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent public function ensureConsistency() { - if ($this->aCcPlaylist !== null && $this->playlist_id !== $this->aCcPlaylist->getId()) { + if ($this->aCcPlaylist !== null && $this->playlist_id !== $this->aCcPlaylist->getDbId()) { $this->aCcPlaylist = null; } if ($this->aCcFiles !== null && $this->file_id !== $this->aCcFiles->getId()) { @@ -957,7 +957,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent $pk = BasePeer::doInsert($criteria, $con); $affectedRows += 1; - $this->setId($pk); //[IMV] update autoincrement primary key + $this->setDbId($pk); //[IMV] update autoincrement primary key $this->setNew(false); } else { $affectedRows += CcPlaylistcontentsPeer::doUpdate($this, $con); @@ -1089,31 +1089,31 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent { switch($pos) { case 0: - return $this->getId(); + return $this->getDbId(); break; case 1: - return $this->getPlaylistId(); + return $this->getDbPlaylistId(); break; case 2: - return $this->getFileId(); + return $this->getDbFileId(); break; case 3: - return $this->getPosition(); + return $this->getDbPosition(); break; case 4: - return $this->getCliplength(); + return $this->getDbCliplength(); break; case 5: - return $this->getCuein(); + return $this->getDbCuein(); break; case 6: - return $this->getCueout(); + return $this->getDbCueout(); break; case 7: - return $this->getFadein(); + return $this->getDbFadein(); break; case 8: - return $this->getFadeout(); + return $this->getDbFadeout(); break; default: return null; @@ -1139,15 +1139,15 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent { $keys = CcPlaylistcontentsPeer::getFieldNames($keyType); $result = array( - $keys[0] => $this->getId(), - $keys[1] => $this->getPlaylistId(), - $keys[2] => $this->getFileId(), - $keys[3] => $this->getPosition(), - $keys[4] => $this->getCliplength(), - $keys[5] => $this->getCuein(), - $keys[6] => $this->getCueout(), - $keys[7] => $this->getFadein(), - $keys[8] => $this->getFadeout(), + $keys[0] => $this->getDbId(), + $keys[1] => $this->getDbPlaylistId(), + $keys[2] => $this->getDbFileId(), + $keys[3] => $this->getDbPosition(), + $keys[4] => $this->getDbCliplength(), + $keys[5] => $this->getDbCuein(), + $keys[6] => $this->getDbCueout(), + $keys[7] => $this->getDbFadein(), + $keys[8] => $this->getDbFadeout(), ); if ($includeForeignObjects) { if (null !== $this->aCcFiles) { @@ -1188,31 +1188,31 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent { switch($pos) { case 0: - $this->setId($value); + $this->setDbId($value); break; case 1: - $this->setPlaylistId($value); + $this->setDbPlaylistId($value); break; case 2: - $this->setFileId($value); + $this->setDbFileId($value); break; case 3: - $this->setPosition($value); + $this->setDbPosition($value); break; case 4: - $this->setCliplength($value); + $this->setDbCliplength($value); break; case 5: - $this->setCuein($value); + $this->setDbCuein($value); break; case 6: - $this->setCueout($value); + $this->setDbCueout($value); break; case 7: - $this->setFadein($value); + $this->setDbFadein($value); break; case 8: - $this->setFadeout($value); + $this->setDbFadeout($value); break; } // switch() } @@ -1238,15 +1238,15 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent { $keys = CcPlaylistcontentsPeer::getFieldNames($keyType); - if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]); - if (array_key_exists($keys[1], $arr)) $this->setPlaylistId($arr[$keys[1]]); - if (array_key_exists($keys[2], $arr)) $this->setFileId($arr[$keys[2]]); - if (array_key_exists($keys[3], $arr)) $this->setPosition($arr[$keys[3]]); - if (array_key_exists($keys[4], $arr)) $this->setCliplength($arr[$keys[4]]); - if (array_key_exists($keys[5], $arr)) $this->setCuein($arr[$keys[5]]); - if (array_key_exists($keys[6], $arr)) $this->setCueout($arr[$keys[6]]); - if (array_key_exists($keys[7], $arr)) $this->setFadein($arr[$keys[7]]); - if (array_key_exists($keys[8], $arr)) $this->setFadeout($arr[$keys[8]]); + if (array_key_exists($keys[0], $arr)) $this->setDbId($arr[$keys[0]]); + if (array_key_exists($keys[1], $arr)) $this->setDbPlaylistId($arr[$keys[1]]); + if (array_key_exists($keys[2], $arr)) $this->setDbFileId($arr[$keys[2]]); + if (array_key_exists($keys[3], $arr)) $this->setDbPosition($arr[$keys[3]]); + if (array_key_exists($keys[4], $arr)) $this->setDbCliplength($arr[$keys[4]]); + if (array_key_exists($keys[5], $arr)) $this->setDbCuein($arr[$keys[5]]); + if (array_key_exists($keys[6], $arr)) $this->setDbCueout($arr[$keys[6]]); + if (array_key_exists($keys[7], $arr)) $this->setDbFadein($arr[$keys[7]]); + if (array_key_exists($keys[8], $arr)) $this->setDbFadeout($arr[$keys[8]]); } /** @@ -1293,7 +1293,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent */ public function getPrimaryKey() { - return $this->getId(); + return $this->getDbId(); } /** @@ -1304,7 +1304,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent */ public function setPrimaryKey($key) { - $this->setId($key); + $this->setDbId($key); } /** @@ -1313,7 +1313,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent */ public function isPrimaryKeyNull() { - return null === $this->getId(); + return null === $this->getDbId(); } /** @@ -1328,17 +1328,17 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent */ public function copyInto($copyObj, $deepCopy = false) { - $copyObj->setPlaylistId($this->playlist_id); - $copyObj->setFileId($this->file_id); - $copyObj->setPosition($this->position); - $copyObj->setCliplength($this->cliplength); - $copyObj->setCuein($this->cuein); - $copyObj->setCueout($this->cueout); - $copyObj->setFadein($this->fadein); - $copyObj->setFadeout($this->fadeout); + $copyObj->setDbPlaylistId($this->playlist_id); + $copyObj->setDbFileId($this->file_id); + $copyObj->setDbPosition($this->position); + $copyObj->setDbCliplength($this->cliplength); + $copyObj->setDbCuein($this->cuein); + $copyObj->setDbCueout($this->cueout); + $copyObj->setDbFadein($this->fadein); + $copyObj->setDbFadeout($this->fadeout); $copyObj->setNew(true); - $copyObj->setId(NULL); // this is a auto-increment column, so set to default value + $copyObj->setDbId(NULL); // this is a auto-increment column, so set to default value } /** @@ -1389,9 +1389,9 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent public function setCcFiles(CcFiles $v = null) { if ($v === null) { - $this->setFileId(NULL); + $this->setDbFileId(NULL); } else { - $this->setFileId($v->getId()); + $this->setDbFileId($v->getId()); } $this->aCcFiles = $v; @@ -1438,9 +1438,9 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent public function setCcPlaylist(CcPlaylist $v = null) { if ($v === null) { - $this->setPlaylistId(NULL); + $this->setDbPlaylistId(NULL); } else { - $this->setPlaylistId($v->getId()); + $this->setDbPlaylistId($v->getDbId()); } $this->aCcPlaylist = $v; diff --git a/backend/propel-db/build/classes/campcaster/om/BaseCcPlaylistcontentsPeer.php b/backend/propel-db/build/classes/campcaster/om/BaseCcPlaylistcontentsPeer.php index 21915405c..1d448bd34 100644 --- a/backend/propel-db/build/classes/campcaster/om/BaseCcPlaylistcontentsPeer.php +++ b/backend/propel-db/build/classes/campcaster/om/BaseCcPlaylistcontentsPeer.php @@ -74,8 +74,8 @@ abstract class BaseCcPlaylistcontentsPeer { * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('Id', 'PlaylistId', 'FileId', 'Position', 'Cliplength', 'Cuein', 'Cueout', 'Fadein', 'Fadeout', ), - BasePeer::TYPE_STUDLYPHPNAME => array ('id', 'playlistId', 'fileId', 'position', 'cliplength', 'cuein', 'cueout', 'fadein', 'fadeout', ), + BasePeer::TYPE_PHPNAME => array ('DbId', 'DbPlaylistId', 'DbFileId', 'DbPosition', 'DbCliplength', 'DbCuein', 'DbCueout', 'DbFadein', 'DbFadeout', ), + BasePeer::TYPE_STUDLYPHPNAME => array ('dbId', 'dbPlaylistId', 'dbFileId', 'dbPosition', 'dbCliplength', 'dbCuein', 'dbCueout', 'dbFadein', 'dbFadeout', ), BasePeer::TYPE_COLNAME => array (self::ID, self::PLAYLIST_ID, self::FILE_ID, self::POSITION, self::CLIPLENGTH, self::CUEIN, self::CUEOUT, self::FADEIN, self::FADEOUT, ), BasePeer::TYPE_RAW_COLNAME => array ('ID', 'PLAYLIST_ID', 'FILE_ID', 'POSITION', 'CLIPLENGTH', 'CUEIN', 'CUEOUT', 'FADEIN', 'FADEOUT', ), BasePeer::TYPE_FIELDNAME => array ('id', 'playlist_id', 'file_id', 'position', 'cliplength', 'cuein', 'cueout', 'fadein', 'fadeout', ), @@ -89,8 +89,8 @@ abstract class BaseCcPlaylistcontentsPeer { * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('Id' => 0, 'PlaylistId' => 1, 'FileId' => 2, 'Position' => 3, 'Cliplength' => 4, 'Cuein' => 5, 'Cueout' => 6, 'Fadein' => 7, 'Fadeout' => 8, ), - BasePeer::TYPE_STUDLYPHPNAME => array ('id' => 0, 'playlistId' => 1, 'fileId' => 2, 'position' => 3, 'cliplength' => 4, 'cuein' => 5, 'cueout' => 6, 'fadein' => 7, 'fadeout' => 8, ), + BasePeer::TYPE_PHPNAME => array ('DbId' => 0, 'DbPlaylistId' => 1, 'DbFileId' => 2, 'DbPosition' => 3, 'DbCliplength' => 4, 'DbCuein' => 5, 'DbCueout' => 6, 'DbFadein' => 7, 'DbFadeout' => 8, ), + BasePeer::TYPE_STUDLYPHPNAME => array ('dbId' => 0, 'dbPlaylistId' => 1, 'dbFileId' => 2, 'dbPosition' => 3, 'dbCliplength' => 4, 'dbCuein' => 5, 'dbCueout' => 6, 'dbFadein' => 7, 'dbFadeout' => 8, ), BasePeer::TYPE_COLNAME => array (self::ID => 0, self::PLAYLIST_ID => 1, self::FILE_ID => 2, self::POSITION => 3, self::CLIPLENGTH => 4, self::CUEIN => 5, self::CUEOUT => 6, self::FADEIN => 7, self::FADEOUT => 8, ), BasePeer::TYPE_RAW_COLNAME => array ('ID' => 0, 'PLAYLIST_ID' => 1, 'FILE_ID' => 2, 'POSITION' => 3, 'CLIPLENGTH' => 4, 'CUEIN' => 5, 'CUEOUT' => 6, 'FADEIN' => 7, 'FADEOUT' => 8, ), BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'playlist_id' => 1, 'file_id' => 2, 'position' => 3, 'cliplength' => 4, 'cuein' => 5, 'cueout' => 6, 'fadein' => 7, 'fadeout' => 8, ), @@ -309,7 +309,7 @@ abstract class BaseCcPlaylistcontentsPeer { { if (Propel::isInstancePoolingEnabled()) { if ($key === null) { - $key = (string) $obj->getId(); + $key = (string) $obj->getDbId(); } // if key === null self::$instances[$key] = $obj; } @@ -329,7 +329,7 @@ abstract class BaseCcPlaylistcontentsPeer { { if (Propel::isInstancePoolingEnabled() && $value !== null) { if (is_object($value) && $value instanceof CcPlaylistcontents) { - $key = (string) $value->getId(); + $key = (string) $value->getDbId(); } elseif (is_scalar($value)) { // assume we've been passed a primary key $key = (string) $value; diff --git a/backend/propel-db/build/classes/campcaster/om/BaseCcPlaylistcontentsQuery.php b/backend/propel-db/build/classes/campcaster/om/BaseCcPlaylistcontentsQuery.php index f508173d8..aca0d6bc7 100644 --- a/backend/propel-db/build/classes/campcaster/om/BaseCcPlaylistcontentsQuery.php +++ b/backend/propel-db/build/classes/campcaster/om/BaseCcPlaylistcontentsQuery.php @@ -6,25 +6,25 @@ * * * - * @method CcPlaylistcontentsQuery orderById($order = Criteria::ASC) Order by the id column - * @method CcPlaylistcontentsQuery orderByPlaylistId($order = Criteria::ASC) Order by the playlist_id column - * @method CcPlaylistcontentsQuery orderByFileId($order = Criteria::ASC) Order by the file_id column - * @method CcPlaylistcontentsQuery orderByPosition($order = Criteria::ASC) Order by the position column - * @method CcPlaylistcontentsQuery orderByCliplength($order = Criteria::ASC) Order by the cliplength column - * @method CcPlaylistcontentsQuery orderByCuein($order = Criteria::ASC) Order by the cuein column - * @method CcPlaylistcontentsQuery orderByCueout($order = Criteria::ASC) Order by the cueout column - * @method CcPlaylistcontentsQuery orderByFadein($order = Criteria::ASC) Order by the fadein column - * @method CcPlaylistcontentsQuery orderByFadeout($order = Criteria::ASC) Order by the fadeout column + * @method CcPlaylistcontentsQuery orderByDbId($order = Criteria::ASC) Order by the id column + * @method CcPlaylistcontentsQuery orderByDbPlaylistId($order = Criteria::ASC) Order by the playlist_id column + * @method CcPlaylistcontentsQuery orderByDbFileId($order = Criteria::ASC) Order by the file_id column + * @method CcPlaylistcontentsQuery orderByDbPosition($order = Criteria::ASC) Order by the position column + * @method CcPlaylistcontentsQuery orderByDbCliplength($order = Criteria::ASC) Order by the cliplength column + * @method CcPlaylistcontentsQuery orderByDbCuein($order = Criteria::ASC) Order by the cuein column + * @method CcPlaylistcontentsQuery orderByDbCueout($order = Criteria::ASC) Order by the cueout column + * @method CcPlaylistcontentsQuery orderByDbFadein($order = Criteria::ASC) Order by the fadein column + * @method CcPlaylistcontentsQuery orderByDbFadeout($order = Criteria::ASC) Order by the fadeout column * - * @method CcPlaylistcontentsQuery groupById() Group by the id column - * @method CcPlaylistcontentsQuery groupByPlaylistId() Group by the playlist_id column - * @method CcPlaylistcontentsQuery groupByFileId() Group by the file_id column - * @method CcPlaylistcontentsQuery groupByPosition() Group by the position column - * @method CcPlaylistcontentsQuery groupByCliplength() Group by the cliplength column - * @method CcPlaylistcontentsQuery groupByCuein() Group by the cuein column - * @method CcPlaylistcontentsQuery groupByCueout() Group by the cueout column - * @method CcPlaylistcontentsQuery groupByFadein() Group by the fadein column - * @method CcPlaylistcontentsQuery groupByFadeout() Group by the fadeout column + * @method CcPlaylistcontentsQuery groupByDbId() Group by the id column + * @method CcPlaylistcontentsQuery groupByDbPlaylistId() Group by the playlist_id column + * @method CcPlaylistcontentsQuery groupByDbFileId() Group by the file_id column + * @method CcPlaylistcontentsQuery groupByDbPosition() Group by the position column + * @method CcPlaylistcontentsQuery groupByDbCliplength() Group by the cliplength column + * @method CcPlaylistcontentsQuery groupByDbCuein() Group by the cuein column + * @method CcPlaylistcontentsQuery groupByDbCueout() Group by the cueout column + * @method CcPlaylistcontentsQuery groupByDbFadein() Group by the fadein column + * @method CcPlaylistcontentsQuery groupByDbFadeout() Group by the fadeout column * * @method CcPlaylistcontentsQuery leftJoin($relation) Adds a LEFT JOIN clause to the query * @method CcPlaylistcontentsQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query @@ -41,25 +41,25 @@ * @method CcPlaylistcontents findOne(PropelPDO $con = null) Return the first CcPlaylistcontents matching the query * @method CcPlaylistcontents findOneOrCreate(PropelPDO $con = null) Return the first CcPlaylistcontents matching the query, or a new CcPlaylistcontents object populated from the query conditions when no match is found * - * @method CcPlaylistcontents findOneById(int $id) Return the first CcPlaylistcontents filtered by the id column - * @method CcPlaylistcontents findOneByPlaylistId(int $playlist_id) Return the first CcPlaylistcontents filtered by the playlist_id column - * @method CcPlaylistcontents findOneByFileId(int $file_id) Return the first CcPlaylistcontents filtered by the file_id column - * @method CcPlaylistcontents findOneByPosition(int $position) Return the first CcPlaylistcontents filtered by the position column - * @method CcPlaylistcontents findOneByCliplength(string $cliplength) Return the first CcPlaylistcontents filtered by the cliplength column - * @method CcPlaylistcontents findOneByCuein(string $cuein) Return the first CcPlaylistcontents filtered by the cuein column - * @method CcPlaylistcontents findOneByCueout(string $cueout) Return the first CcPlaylistcontents filtered by the cueout column - * @method CcPlaylistcontents findOneByFadein(string $fadein) Return the first CcPlaylistcontents filtered by the fadein column - * @method CcPlaylistcontents findOneByFadeout(string $fadeout) Return the first CcPlaylistcontents filtered by the fadeout column + * @method CcPlaylistcontents findOneByDbId(int $id) Return the first CcPlaylistcontents filtered by the id column + * @method CcPlaylistcontents findOneByDbPlaylistId(int $playlist_id) Return the first CcPlaylistcontents filtered by the playlist_id column + * @method CcPlaylistcontents findOneByDbFileId(int $file_id) Return the first CcPlaylistcontents filtered by the file_id column + * @method CcPlaylistcontents findOneByDbPosition(int $position) Return the first CcPlaylistcontents filtered by the position column + * @method CcPlaylistcontents findOneByDbCliplength(string $cliplength) Return the first CcPlaylistcontents filtered by the cliplength column + * @method CcPlaylistcontents findOneByDbCuein(string $cuein) Return the first CcPlaylistcontents filtered by the cuein column + * @method CcPlaylistcontents findOneByDbCueout(string $cueout) Return the first CcPlaylistcontents filtered by the cueout column + * @method CcPlaylistcontents findOneByDbFadein(string $fadein) Return the first CcPlaylistcontents filtered by the fadein column + * @method CcPlaylistcontents findOneByDbFadeout(string $fadeout) Return the first CcPlaylistcontents filtered by the fadeout column * - * @method array findById(int $id) Return CcPlaylistcontents objects filtered by the id column - * @method array findByPlaylistId(int $playlist_id) Return CcPlaylistcontents objects filtered by the playlist_id column - * @method array findByFileId(int $file_id) Return CcPlaylistcontents objects filtered by the file_id column - * @method array findByPosition(int $position) Return CcPlaylistcontents objects filtered by the position column - * @method array findByCliplength(string $cliplength) Return CcPlaylistcontents objects filtered by the cliplength column - * @method array findByCuein(string $cuein) Return CcPlaylistcontents objects filtered by the cuein column - * @method array findByCueout(string $cueout) Return CcPlaylistcontents objects filtered by the cueout column - * @method array findByFadein(string $fadein) Return CcPlaylistcontents objects filtered by the fadein column - * @method array findByFadeout(string $fadeout) Return CcPlaylistcontents objects filtered by the fadeout column + * @method array findByDbId(int $id) Return CcPlaylistcontents objects filtered by the id column + * @method array findByDbPlaylistId(int $playlist_id) Return CcPlaylistcontents objects filtered by the playlist_id column + * @method array findByDbFileId(int $file_id) Return CcPlaylistcontents objects filtered by the file_id column + * @method array findByDbPosition(int $position) Return CcPlaylistcontents objects filtered by the position column + * @method array findByDbCliplength(string $cliplength) Return CcPlaylistcontents objects filtered by the cliplength column + * @method array findByDbCuein(string $cuein) Return CcPlaylistcontents objects filtered by the cuein column + * @method array findByDbCueout(string $cueout) Return CcPlaylistcontents objects filtered by the cueout column + * @method array findByDbFadein(string $fadein) Return CcPlaylistcontents objects filtered by the fadein column + * @method array findByDbFadeout(string $fadeout) Return CcPlaylistcontents objects filtered by the fadeout column * * @package propel.generator.campcaster.om */ @@ -172,39 +172,39 @@ abstract class BaseCcPlaylistcontentsQuery extends ModelCriteria /** * Filter the query on the id column * - * @param int|array $id The value to use as filter. + * @param int|array $dbId The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return CcPlaylistcontentsQuery The current query, for fluid interface */ - public function filterById($id = null, $comparison = null) + public function filterByDbId($dbId = null, $comparison = null) { - if (is_array($id) && null === $comparison) { + if (is_array($dbId) && null === $comparison) { $comparison = Criteria::IN; } - return $this->addUsingAlias(CcPlaylistcontentsPeer::ID, $id, $comparison); + return $this->addUsingAlias(CcPlaylistcontentsPeer::ID, $dbId, $comparison); } /** * Filter the query on the playlist_id column * - * @param int|array $playlistId The value to use as filter. + * @param int|array $dbPlaylistId The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return CcPlaylistcontentsQuery The current query, for fluid interface */ - public function filterByPlaylistId($playlistId = null, $comparison = null) + public function filterByDbPlaylistId($dbPlaylistId = null, $comparison = null) { - if (is_array($playlistId)) { + if (is_array($dbPlaylistId)) { $useMinMax = false; - if (isset($playlistId['min'])) { - $this->addUsingAlias(CcPlaylistcontentsPeer::PLAYLIST_ID, $playlistId['min'], Criteria::GREATER_EQUAL); + if (isset($dbPlaylistId['min'])) { + $this->addUsingAlias(CcPlaylistcontentsPeer::PLAYLIST_ID, $dbPlaylistId['min'], Criteria::GREATER_EQUAL); $useMinMax = true; } - if (isset($playlistId['max'])) { - $this->addUsingAlias(CcPlaylistcontentsPeer::PLAYLIST_ID, $playlistId['max'], Criteria::LESS_EQUAL); + if (isset($dbPlaylistId['max'])) { + $this->addUsingAlias(CcPlaylistcontentsPeer::PLAYLIST_ID, $dbPlaylistId['max'], Criteria::LESS_EQUAL); $useMinMax = true; } if ($useMinMax) { @@ -214,28 +214,28 @@ abstract class BaseCcPlaylistcontentsQuery extends ModelCriteria $comparison = Criteria::IN; } } - return $this->addUsingAlias(CcPlaylistcontentsPeer::PLAYLIST_ID, $playlistId, $comparison); + return $this->addUsingAlias(CcPlaylistcontentsPeer::PLAYLIST_ID, $dbPlaylistId, $comparison); } /** * Filter the query on the file_id column * - * @param int|array $fileId The value to use as filter. + * @param int|array $dbFileId The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return CcPlaylistcontentsQuery The current query, for fluid interface */ - public function filterByFileId($fileId = null, $comparison = null) + public function filterByDbFileId($dbFileId = null, $comparison = null) { - if (is_array($fileId)) { + if (is_array($dbFileId)) { $useMinMax = false; - if (isset($fileId['min'])) { - $this->addUsingAlias(CcPlaylistcontentsPeer::FILE_ID, $fileId['min'], Criteria::GREATER_EQUAL); + if (isset($dbFileId['min'])) { + $this->addUsingAlias(CcPlaylistcontentsPeer::FILE_ID, $dbFileId['min'], Criteria::GREATER_EQUAL); $useMinMax = true; } - if (isset($fileId['max'])) { - $this->addUsingAlias(CcPlaylistcontentsPeer::FILE_ID, $fileId['max'], Criteria::LESS_EQUAL); + if (isset($dbFileId['max'])) { + $this->addUsingAlias(CcPlaylistcontentsPeer::FILE_ID, $dbFileId['max'], Criteria::LESS_EQUAL); $useMinMax = true; } if ($useMinMax) { @@ -245,28 +245,28 @@ abstract class BaseCcPlaylistcontentsQuery extends ModelCriteria $comparison = Criteria::IN; } } - return $this->addUsingAlias(CcPlaylistcontentsPeer::FILE_ID, $fileId, $comparison); + return $this->addUsingAlias(CcPlaylistcontentsPeer::FILE_ID, $dbFileId, $comparison); } /** * Filter the query on the position column * - * @param int|array $position The value to use as filter. + * @param int|array $dbPosition The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return CcPlaylistcontentsQuery The current query, for fluid interface */ - public function filterByPosition($position = null, $comparison = null) + public function filterByDbPosition($dbPosition = null, $comparison = null) { - if (is_array($position)) { + if (is_array($dbPosition)) { $useMinMax = false; - if (isset($position['min'])) { - $this->addUsingAlias(CcPlaylistcontentsPeer::POSITION, $position['min'], Criteria::GREATER_EQUAL); + if (isset($dbPosition['min'])) { + $this->addUsingAlias(CcPlaylistcontentsPeer::POSITION, $dbPosition['min'], Criteria::GREATER_EQUAL); $useMinMax = true; } - if (isset($position['max'])) { - $this->addUsingAlias(CcPlaylistcontentsPeer::POSITION, $position['max'], Criteria::LESS_EQUAL); + if (isset($dbPosition['max'])) { + $this->addUsingAlias(CcPlaylistcontentsPeer::POSITION, $dbPosition['max'], Criteria::LESS_EQUAL); $useMinMax = true; } if ($useMinMax) { @@ -276,28 +276,28 @@ abstract class BaseCcPlaylistcontentsQuery extends ModelCriteria $comparison = Criteria::IN; } } - return $this->addUsingAlias(CcPlaylistcontentsPeer::POSITION, $position, $comparison); + return $this->addUsingAlias(CcPlaylistcontentsPeer::POSITION, $dbPosition, $comparison); } /** * Filter the query on the cliplength column * - * @param string|array $cliplength The value to use as filter. + * @param string|array $dbCliplength The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return CcPlaylistcontentsQuery The current query, for fluid interface */ - public function filterByCliplength($cliplength = null, $comparison = null) + public function filterByDbCliplength($dbCliplength = null, $comparison = null) { - if (is_array($cliplength)) { + if (is_array($dbCliplength)) { $useMinMax = false; - if (isset($cliplength['min'])) { - $this->addUsingAlias(CcPlaylistcontentsPeer::CLIPLENGTH, $cliplength['min'], Criteria::GREATER_EQUAL); + if (isset($dbCliplength['min'])) { + $this->addUsingAlias(CcPlaylistcontentsPeer::CLIPLENGTH, $dbCliplength['min'], Criteria::GREATER_EQUAL); $useMinMax = true; } - if (isset($cliplength['max'])) { - $this->addUsingAlias(CcPlaylistcontentsPeer::CLIPLENGTH, $cliplength['max'], Criteria::LESS_EQUAL); + if (isset($dbCliplength['max'])) { + $this->addUsingAlias(CcPlaylistcontentsPeer::CLIPLENGTH, $dbCliplength['max'], Criteria::LESS_EQUAL); $useMinMax = true; } if ($useMinMax) { @@ -307,28 +307,28 @@ abstract class BaseCcPlaylistcontentsQuery extends ModelCriteria $comparison = Criteria::IN; } } - return $this->addUsingAlias(CcPlaylistcontentsPeer::CLIPLENGTH, $cliplength, $comparison); + return $this->addUsingAlias(CcPlaylistcontentsPeer::CLIPLENGTH, $dbCliplength, $comparison); } /** * Filter the query on the cuein column * - * @param string|array $cuein The value to use as filter. + * @param string|array $dbCuein The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return CcPlaylistcontentsQuery The current query, for fluid interface */ - public function filterByCuein($cuein = null, $comparison = null) + public function filterByDbCuein($dbCuein = null, $comparison = null) { - if (is_array($cuein)) { + if (is_array($dbCuein)) { $useMinMax = false; - if (isset($cuein['min'])) { - $this->addUsingAlias(CcPlaylistcontentsPeer::CUEIN, $cuein['min'], Criteria::GREATER_EQUAL); + if (isset($dbCuein['min'])) { + $this->addUsingAlias(CcPlaylistcontentsPeer::CUEIN, $dbCuein['min'], Criteria::GREATER_EQUAL); $useMinMax = true; } - if (isset($cuein['max'])) { - $this->addUsingAlias(CcPlaylistcontentsPeer::CUEIN, $cuein['max'], Criteria::LESS_EQUAL); + if (isset($dbCuein['max'])) { + $this->addUsingAlias(CcPlaylistcontentsPeer::CUEIN, $dbCuein['max'], Criteria::LESS_EQUAL); $useMinMax = true; } if ($useMinMax) { @@ -338,28 +338,28 @@ abstract class BaseCcPlaylistcontentsQuery extends ModelCriteria $comparison = Criteria::IN; } } - return $this->addUsingAlias(CcPlaylistcontentsPeer::CUEIN, $cuein, $comparison); + return $this->addUsingAlias(CcPlaylistcontentsPeer::CUEIN, $dbCuein, $comparison); } /** * Filter the query on the cueout column * - * @param string|array $cueout The value to use as filter. + * @param string|array $dbCueout The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return CcPlaylistcontentsQuery The current query, for fluid interface */ - public function filterByCueout($cueout = null, $comparison = null) + public function filterByDbCueout($dbCueout = null, $comparison = null) { - if (is_array($cueout)) { + if (is_array($dbCueout)) { $useMinMax = false; - if (isset($cueout['min'])) { - $this->addUsingAlias(CcPlaylistcontentsPeer::CUEOUT, $cueout['min'], Criteria::GREATER_EQUAL); + if (isset($dbCueout['min'])) { + $this->addUsingAlias(CcPlaylistcontentsPeer::CUEOUT, $dbCueout['min'], Criteria::GREATER_EQUAL); $useMinMax = true; } - if (isset($cueout['max'])) { - $this->addUsingAlias(CcPlaylistcontentsPeer::CUEOUT, $cueout['max'], Criteria::LESS_EQUAL); + if (isset($dbCueout['max'])) { + $this->addUsingAlias(CcPlaylistcontentsPeer::CUEOUT, $dbCueout['max'], Criteria::LESS_EQUAL); $useMinMax = true; } if ($useMinMax) { @@ -369,28 +369,28 @@ abstract class BaseCcPlaylistcontentsQuery extends ModelCriteria $comparison = Criteria::IN; } } - return $this->addUsingAlias(CcPlaylistcontentsPeer::CUEOUT, $cueout, $comparison); + return $this->addUsingAlias(CcPlaylistcontentsPeer::CUEOUT, $dbCueout, $comparison); } /** * Filter the query on the fadein column * - * @param string|array $fadein The value to use as filter. + * @param string|array $dbFadein The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return CcPlaylistcontentsQuery The current query, for fluid interface */ - public function filterByFadein($fadein = null, $comparison = null) + public function filterByDbFadein($dbFadein = null, $comparison = null) { - if (is_array($fadein)) { + if (is_array($dbFadein)) { $useMinMax = false; - if (isset($fadein['min'])) { - $this->addUsingAlias(CcPlaylistcontentsPeer::FADEIN, $fadein['min'], Criteria::GREATER_EQUAL); + if (isset($dbFadein['min'])) { + $this->addUsingAlias(CcPlaylistcontentsPeer::FADEIN, $dbFadein['min'], Criteria::GREATER_EQUAL); $useMinMax = true; } - if (isset($fadein['max'])) { - $this->addUsingAlias(CcPlaylistcontentsPeer::FADEIN, $fadein['max'], Criteria::LESS_EQUAL); + if (isset($dbFadein['max'])) { + $this->addUsingAlias(CcPlaylistcontentsPeer::FADEIN, $dbFadein['max'], Criteria::LESS_EQUAL); $useMinMax = true; } if ($useMinMax) { @@ -400,28 +400,28 @@ abstract class BaseCcPlaylistcontentsQuery extends ModelCriteria $comparison = Criteria::IN; } } - return $this->addUsingAlias(CcPlaylistcontentsPeer::FADEIN, $fadein, $comparison); + return $this->addUsingAlias(CcPlaylistcontentsPeer::FADEIN, $dbFadein, $comparison); } /** * Filter the query on the fadeout column * - * @param string|array $fadeout The value to use as filter. + * @param string|array $dbFadeout The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return CcPlaylistcontentsQuery The current query, for fluid interface */ - public function filterByFadeout($fadeout = null, $comparison = null) + public function filterByDbFadeout($dbFadeout = null, $comparison = null) { - if (is_array($fadeout)) { + if (is_array($dbFadeout)) { $useMinMax = false; - if (isset($fadeout['min'])) { - $this->addUsingAlias(CcPlaylistcontentsPeer::FADEOUT, $fadeout['min'], Criteria::GREATER_EQUAL); + if (isset($dbFadeout['min'])) { + $this->addUsingAlias(CcPlaylistcontentsPeer::FADEOUT, $dbFadeout['min'], Criteria::GREATER_EQUAL); $useMinMax = true; } - if (isset($fadeout['max'])) { - $this->addUsingAlias(CcPlaylistcontentsPeer::FADEOUT, $fadeout['max'], Criteria::LESS_EQUAL); + if (isset($dbFadeout['max'])) { + $this->addUsingAlias(CcPlaylistcontentsPeer::FADEOUT, $dbFadeout['max'], Criteria::LESS_EQUAL); $useMinMax = true; } if ($useMinMax) { @@ -431,7 +431,7 @@ abstract class BaseCcPlaylistcontentsQuery extends ModelCriteria $comparison = Criteria::IN; } } - return $this->addUsingAlias(CcPlaylistcontentsPeer::FADEOUT, $fadeout, $comparison); + return $this->addUsingAlias(CcPlaylistcontentsPeer::FADEOUT, $dbFadeout, $comparison); } /** @@ -509,7 +509,7 @@ abstract class BaseCcPlaylistcontentsQuery extends ModelCriteria public function filterByCcPlaylist($ccPlaylist, $comparison = null) { return $this - ->addUsingAlias(CcPlaylistcontentsPeer::PLAYLIST_ID, $ccPlaylist->getId(), $comparison); + ->addUsingAlias(CcPlaylistcontentsPeer::PLAYLIST_ID, $ccPlaylist->getDbId(), $comparison); } /** @@ -572,7 +572,7 @@ abstract class BaseCcPlaylistcontentsQuery extends ModelCriteria public function prune($ccPlaylistcontents = null) { if ($ccPlaylistcontents) { - $this->addUsingAlias(CcPlaylistcontentsPeer::ID, $ccPlaylistcontents->getId(), Criteria::NOT_EQUAL); + $this->addUsingAlias(CcPlaylistcontentsPeer::ID, $ccPlaylistcontents->getDbId(), Criteria::NOT_EQUAL); } return $this; diff --git a/backend/propel-db/build/classes/campcaster/om/BaseCcSubjsQuery.php b/backend/propel-db/build/classes/campcaster/om/BaseCcSubjsQuery.php index 7b6e01d78..af3b6fe5e 100644 --- a/backend/propel-db/build/classes/campcaster/om/BaseCcSubjsQuery.php +++ b/backend/propel-db/build/classes/campcaster/om/BaseCcSubjsQuery.php @@ -547,7 +547,7 @@ abstract class BaseCcSubjsQuery extends ModelCriteria public function filterByCcPlaylist($ccPlaylist, $comparison = null) { return $this - ->addUsingAlias(CcSubjsPeer::ID, $ccPlaylist->getEditedby(), $comparison); + ->addUsingAlias(CcSubjsPeer::ID, $ccPlaylist->getDbEditedby(), $comparison); } /** diff --git a/backend/propel-db/schema.xml b/backend/propel-db/schema.xml index 1c45dcb48..e11ac50d1 100644 --- a/backend/propel-db/schema.xml +++ b/backend/propel-db/schema.xml @@ -121,28 +121,28 @@ - - - - - - - - + + + + + + + +
- - - - - - - - - + + + + + + + + + diff --git a/htmlUI/init_load_once.php b/htmlUI/init_load_once.php index 26dd6effb..c2b38132c 100644 --- a/htmlUI/init_load_once.php +++ b/htmlUI/init_load_once.php @@ -2,6 +2,12 @@ # NOTE: You have to load all classes that use session variables BEFORE you make a call to session_start()!!! session_start(); +// Initialize Propel with the runtime configuration +Propel::init(__DIR__."/../backend/propel-db/build/conf/campcaster-conf.php"); + +// Add the generated 'classes' directory to the include path +set_include_path(__DIR__."/../backend/propel-db/build/classes" . PATH_SEPARATOR . get_include_path()); + // initialize objects ############################################### $Smarty = new Smarty; $Smarty->caching = false; @@ -22,14 +28,13 @@ $uiBase =& $uiBrowser; $jscom = new jscom(array("jscom_wrapper")); $jscom->handler(); - // load Smarty+filters ############################################## require_once(dirname(__FILE__).'/ui_smartyExtensions.inc.php'); + //$Smarty->load_filter('output', 'trimwhitespace'); //$Smarty->load_filter('post', 'template_marker'); $Smarty->load_filter('output', 'localizer'); - // some basic things ################################################ foreach (get_defined_constants() as $k=>$v) { $Smarty->assign($k, $v); @@ -64,4 +69,4 @@ if (isset($_SESSION['retransferFormData']) && is_array($_SESSION['retransferForm unset($_SESSION['retransferFormData']); } -?> \ No newline at end of file +?> diff --git a/htmlUI/templates/library/actionhandler.tpl b/htmlUI/templates/library/actionhandler.tpl index a80ac5c99..b37157538 100644 --- a/htmlUI/templates/library/actionhandler.tpl +++ b/htmlUI/templates/library/actionhandler.tpl @@ -35,13 +35,13 @@ onClick="return contextmenu('{$i.id}' , '{$i.type}' , 'SCHEDULER.addPL' , 'PL.addItem' , 'PL.activate' - , 'delete' + , 'PL.delete' {/if} {else} , 'SCHEDULER.addPL' , 'PL.activate' , 'PL.create' - , 'delete' + , 'PL.delete' , 'PL.export' {/if} {/if} diff --git a/htmlUI/templates/scratchpad/actionhandler.tpl b/htmlUI/templates/scratchpad/actionhandler.tpl index e350c03c7..83a16a5ae 100644 --- a/htmlUI/templates/scratchpad/actionhandler.tpl +++ b/htmlUI/templates/scratchpad/actionhandler.tpl @@ -45,7 +45,7 @@ onClick="return contextmenu('{$i.id}' , 'SCHEDULER.addPL' , 'PL.activate' , 'PL.create' - , 'delete' + , 'PL.delete' , 'PL.export' {/if} {/if} diff --git a/htmlUI/templates/script/contextmenu.js.tpl b/htmlUI/templates/script/contextmenu.js.tpl index 489ca9b63..8e84e04d2 100644 --- a/htmlUI/templates/script/contextmenu.js.tpl +++ b/htmlUI/templates/script/contextmenu.js.tpl @@ -49,6 +49,10 @@ function contextmenu(param, type) { contextmenuHtml = contextmenuHtml + "
  •  ##Edit## 
    • "; break; + case "PL.delete": + contextmenuHtml = contextmenuHtml + "
  •  ##Delete## 
    • "; + break; + case "PL.create": contextmenuHtml = contextmenuHtml + "
  •  ##Use to create playlist## 
    • "; break; diff --git a/htmlUI/ui_browser_init.php b/htmlUI/ui_browser_init.php index 4f94e2a64..a78c072cb 100644 --- a/htmlUI/ui_browser_init.php +++ b/htmlUI/ui_browser_init.php @@ -6,6 +6,7 @@ require_once(dirname(__FILE__).'/ui_browser.class.php'); require_once(dirname(__FILE__).'/ui_handler.class.php'); // often used classes ############################################### +require_once(dirname(__FILE__).'/../3rd_party/php/propel/runtime/lib/Propel.php'); require_once(dirname(__FILE__).'/../3rd_party/php/Smarty/libs/Smarty.class.php'); require_once(dirname(__FILE__).'/../3rd_party/php/pear/HTML/QuickForm/Renderer/ArraySmarty.php'); require_once(dirname(__FILE__).'/ui_scratchpad.class.php'); @@ -28,4 +29,4 @@ if (isset($WHITE_SCREEN_OF_DEATH) && ($WHITE_SCREEN_OF_DEATH == TRUE)) { } -?> \ No newline at end of file +?> diff --git a/htmlUI/ui_handler.php b/htmlUI/ui_handler.php index d26d859e4..247a530d8 100644 --- a/htmlUI/ui_handler.php +++ b/htmlUI/ui_handler.php @@ -403,6 +403,13 @@ switch ($_REQUEST['act']) { } $uiHandler->PLAYLIST->setReload(); break; + + case "PL.delete": + if (($ui_tmpid = $uiHandler->PLAYLIST->delete($_REQUEST['id'])) !== FALSE) { + $uiHandler->SCRATCHPAD->removeItems($ui_tmpid); + } + $uiHandler->PLAYLIST->setReload(); + break; case "PL.export": $uiHandler->redirUrl = UI_BROWSER."?popup[]=PL.redirect2DownloadExportedFile&id={$_REQUEST['id']}&playlisttype={$_REQUEST['playlisttype']}&exporttype={$_REQUEST['exporttype']}"; @@ -436,7 +443,6 @@ switch ($_REQUEST['act']) { $Smarty->assign("USER_ERROR", "Scheduling conflict."); } - //$uiHandler->SCHEDULER->setReload(); $NO_REDIRECT = true; $_REQUEST["act"] = "SCHEDULER"; include("ui_browser.php"); diff --git a/htmlUI/ui_playlist.class.php b/htmlUI/ui_playlist.class.php index 321c3f467..7b1de5c35 100644 --- a/htmlUI/ui_playlist.class.php +++ b/htmlUI/ui_playlist.class.php @@ -100,7 +100,7 @@ class uiPlaylist return FALSE; } $res = $this->Base->gb->lockPlaylistForEdit($plid, $this->Base->sessid); - if (PEAR::isError($res)) { + if (PEAR::isError($res) || $res === FALSE) { if (UI_VERBOSE === TRUE) { print_r($res); } @@ -130,7 +130,7 @@ class uiPlaylist return FALSE; } $res = $this->Base->gb->releaseLockedPlaylist($this->activeId, $this->Base->sessid); - if (PEAR::isError($res)) { + if (PEAR::isError($res) || $res === FALSE) { if (UI_VERBOSE === TRUE) { print_r($res); } @@ -438,7 +438,17 @@ class uiPlaylist $this->Base->_retMsg('Cannot delete this playlist.'); return FALSE; } // fn deleteActive + + public function delete($id) + { + $res = $this->Base->gb->deletePlaylist($id); + if ($res === TRUE) { + return $id; + } + $this->Base->_retMsg('Cannot delete this playlist.'); + return FALSE; + } public function isAvailable($id) {