diff options
| -rw-r--r-- | phpfspot.class.php | 70 | ||||
| -rw-r--r-- | phpfspot.js | 24 | ||||
| -rw-r--r-- | rpc.php | 5 | ||||
| -rw-r--r-- | templates/tags.tpl | 16 |
4 files changed, 101 insertions, 14 deletions
diff --git a/phpfspot.class.php b/phpfspot.class.php index f405626..7bccc9e 100644 --- a/phpfspot.class.php +++ b/phpfspot.class.php @@ -27,6 +27,11 @@ class PHPFSPOT { $this->get_tags(); + session_start(); + + if(!isset($_SESSION['tag_condition'])) + $_SESSION['tag_condition'] = 'or'; + } // __construct() public function __destruct() @@ -37,6 +42,7 @@ class PHPFSPOT { public function show() { $this->tmpl->assign('page_title', $this->cfg->page_title); + $this->tmpl->assign('current_condition', $_SESSION['tag_condition']); $this->tmpl->show("index.tpl"); } // show() @@ -192,14 +198,49 @@ class PHPFSPOT { foreach($_SESSION['selected_tags'] as $tag) $selected.= $tag .","; $selected = substr($selected, 0, strlen($selected)-1); - $result = $this->db->db_query(" - SELECT DISTINCT photo_id - FROM photo_tags pt - INNER JOIN photos p - ON p.id=pt.photo_id - WHERE pt.tag_id IN (". $selected .") - ORDER BY p.time ASC - "); + + if($_SESSION['tag_condition'] == 'or') { + $result = $this->db->db_query(" + SELECT DISTINCT photo_id + FROM photo_tags pt + INNER JOIN photos p + ON p.id=pt.photo_id + WHERE pt.tag_id IN (". $selected .") + ORDER BY p.time ASC + "); + while($row = $this->db->db_fetch_object($result)) { + array_push($tagged_photos, $row['photo_id']); + } + } + elseif($_SESSION['tag_condition'] == 'and') { + $result = $this->db->db_query(" + SELECT DISTINCT photo_id, tag_id + FROM photo_tags pt + INNER JOIN photos p + on p.id=pt.photo_id + WHERE pt.tag_id IN (". $selected .") + ORDER BY p.time ASC + "); + + /* now we need to check if each object fulfills the condition + and has all the selected tags assigned + */ + $match_object = Array(); + $matches_needed = count($_SESSION['selected_tags']); + while($row = $this->db->db_fetch_object($result)) { + /* set the counter for this object */ + if(!isset($match_object[$row['photo_id']])) + $match_object[$row['photo_id']] = $matches_needed; + + /* we have a match? decrement the counter */ + if(in_array($row['tag_id'], $_SESSION['selected_tags'])) + $match_object[$row['photo_id']]--; + + /* if the object has all necessary tags, add it to the result */ + if($match_object[$row['photo_id']] == 0) + array_push($tagged_photos, $row['photo_id']); + } + } } else { $result = $this->db->db_query(" @@ -209,10 +250,9 @@ class PHPFSPOT { ON p.id=pt.photo_id ORDER BY p.time ASC "); - } - - while($row = $this->db->db_fetch_object($result)) { - array_push($tagged_photos, $row['photo_id']); + while($row = $this->db->db_fetch_object($result)) { + array_push($tagged_photos, $row['photo_id']); + } } return $tagged_photos; @@ -434,6 +474,12 @@ class PHPFSPOT { } // setMD5() + public function setTagCondition($mode) + { + $_SESSION['tag_condition'] = $mode; + + } // setTagCondition() + } ?> diff --git a/phpfspot.js b/phpfspot.js index c691b55..b7c6794 100644 --- a/phpfspot.js +++ b/phpfspot.js @@ -23,6 +23,10 @@ function Tags(mode, id) else if(mode == "reset") { HTML_AJAX.grab('rpc.php?action=resettags'); } + else if(mode == "condition") { + setCheckedValue(id, id.value); + HTML_AJAX.grab('rpc.php?action=tagcondition&mode=' + id.value); + } refreshAvailableTags(); refreshSelectedTags(); @@ -70,3 +74,23 @@ function click(object) } +// set the radio button with the given value as being checked +// do nothing if there are no radio buttons +// if the given value does not exist, all the radio buttons +// are reset to unchecked +function setCheckedValue(condition, value) { + + var count = condition.length; + if(count == undefined) { + condition.checked = (condition.value == value.toString()); + return; + } + for(var i = 0; i < count; i++) { + condition[i].checked = false; + if(condition[i].value == value.toString()) { + condition[i].checked = true; + } + } +} + + @@ -73,6 +73,11 @@ class PHPFSPOT_RPC { $fspot->resetTags(); break; + case 'tagcondition': + + $fspot->setTagCondition($_GET['mode']); + break; + case 'show_photo_index': $fspot->showPhotoIndex(); diff --git a/templates/tags.tpl b/templates/tags.tpl index 812b36a..99c8b90 100644 --- a/templates/tags.tpl +++ b/templates/tags.tpl @@ -10,8 +10,20 @@ </td> </tr> <tr> - <td style="vertical-align: middle; text-decoration: underline;"> - <img src="resources/selected_tags.png" />Selected Tags: + <td> + <table style="width: 100%;"> + <tr> + <td style="vertical-align: bottom; text-decoration: underline;"> + <img src="resources/selected_tags.png" />Selected Tags: + </td> + <td style="vertical-align: bottom;"> + + Condition: + <input type="radio" name="condition" value="or" onclick="Tags('condition', this);" {if $current_condition == "or" } checked="checked" { /if } />OR + <input type="radio" name="condition" value="and" onclick="Tags('condition', this);" {if $current_condition == "and" } checked="checked" { /if } />AND + </td> + </tr> + </table> </td> </tr> <tr> |