Adjustments to the state level protection of rare species

Author: egbot

classes/ChecklistAdmin.php

@@ -1,6 +1,5 @@
 <?php
 include_once($serverRoot.'/config/dbconnection.php');
-include_once($serverRoot.'/classes/OccurrenceUtilities.php');
 
 class ChecklistAdmin {
 
@@ -85,7 +84,22 @@ public function editMetaData($postArr){
 		}
 		$sql = 'UPDATE fmchecklists SET '.substr($setSql,2).' WHERE (clid = '.$this->clid.')';
 		//echo $sql; exit;
-		if(!$this->conn->query($sql)){
+		if($this->conn->query($sql)){
+			if($postArr['type'] == 'rarespp'){
+				if($postArr['locality']){
+					$sql = 'UPDATE omoccurrences o INNER JOIN taxstatus ts1 ON o.tidinterpreted = ts1.tid '.
+						'INNER JOIN taxstatus ts2 ON ts1.tidaccepted = ts2.tidaccepted '.
+						'INNER JOIN fmchklsttaxalink cl ON ts2.tid = cl.tid '.
+						'SET o.localitysecurity = 1 '.
+						'WHERE (cl.clid = '.$this->clid.') AND (o.stateprovince = "'.$postArr['locality'].'") '.
+						'AND (o.localitysecurity IS NULL OR o.localitysecurity = 0) AND (ts1.taxauthid = 1) AND (ts2.taxauthid = 1) ';
+					if(!$this->conn->query($sql)){
+						$statusStr = 'Error updating rare state species: '.$this->conn->error;
+					}
+				}
+			}
+		}
+		else{
 			$statusStr = 'Error: unable to update checklist metadata. SQL: '.$this->conn->error;
 		}
 		return $statusStr;
@@ -240,8 +254,8 @@ public function addNewSpecies($dataArr,$setRareSpp = false){
 					$sqlRare = 'UPDATE omoccurrences o INNER JOIN taxstatus ts1 ON o.tidinterpreted = ts1.tid '.
 						'INNER JOIN taxstatus ts2 ON ts1.tidaccepted = ts2.tidaccepted '.
 						'SET o.localitysecurity = 1 '.
-						'WHERE (o.localitysecurity IS NULL OR o.localitysecurity = 0) AND ts1.taxauthid = 1 AND ts2.taxauthid = 1 '.
-						'AND o.stateprovince = "'.$state.'" AND ts2.tid = '.$dataArr['tid'];
+						'WHERE (o.localitysecurity IS NULL OR o.localitysecurity = 0) AND (ts1.taxauthid = 1) AND (ts2.taxauthid = 1) '.
+						'AND (o.stateprovince = "'.$state.'") AND (ts2.tid = '.$dataArr['tid'].')';
 					//echo $sqlRare; exit;
 					$this->conn->query($sqlRare);
 				}

classes/OccurrenceUtilities.php

@@ -883,13 +883,13 @@ public function protectGloballyRareSpecies($collid = 0){
 		//protect globally rare species
 		if($this->verbose) $this->outputMsg('Protecting globally rare species... ',1);
 		$sensitiveArr = array();
-		$sql = 'SELECT DISTINCT t.tid, ts.tidaccepted '.
-			'FROM taxa t INNER JOIN taxstatus ts ON t.tid = ts.tid '. 
-			'WHERE (ts.taxauthid = 1) AND (t.SecurityStatus > 0)';
+		$sql = 'SELECT DISTINCT ts2.tid '.
+			'FROM taxa t INNER JOIN taxstatus ts ON t.tid = ts.tid '.
+			'INNER JOIN taxstatus ts2 ON ts.tidaccepted = ts2.tidaccepted '.
+			'WHERE (ts.taxauthid = 1) AND (ts2.taxauthid = 1) AND (t.SecurityStatus > 0)';
 		$rs = $this->conn->query($sql); 
 		while($r = $rs->fetch_object()){
-			$sensitiveArr[$r->tid] = $r->tid; 
-			$sensitiveArr[$r->tidaccepted] = $r->tidaccepted; 
+			$sensitiveArr[] = $r->tid; 
 		}
 		$rs->free();
 

classes/VoucherManager.php

@@ -190,7 +190,7 @@ public function deleteTaxon($rareLocality = ''){
 	}
 
 	private function setStateRare($rareLocality){
-		//Check to make sure name it's already on global list
+		//Remove state based security protection only if name is not on global list
 		$sql = 'SELECT IFNULL(securitystatus,0) as securitystatus FROM taxa WHERE tid = '.$this->tid;
 		//echo $sql;
 		$rs = $this->conn->query($sql);