[Archive-access-cvs] archive-access/projects/wera/src/webapps/wera/lib meta.inc,1.1,1.2

[Sverre B. <sv...@us...>]

Update of /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20658/lib

Modified Files:
	meta.inc 
Log Message:


Index: meta.inc
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/lib/meta.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** meta.inc	5 Oct 2005 22:43:56 -0000	1.1
--- meta.inc	10 Oct 2005 11:23:40 -0000	1.2
***************
*** 56,59 ****
--- 56,60 ----
  					"content_checksum" => false,
  					"http-header" => false,
+ 					"errormessage" => false
  				);
  
***************
*** 65,69 ****
  	*/
  	function metaParser($aid) {
! 		include ("../lib/config.inc");
  		$this->aid = $aid;
  		$this->retriever_url = $document_retriever . "?reqtype=getmeta&aid=" . $this->aid."&reqtype=getmeta";
--- 66,70 ----
  	*/
  	function metaParser($aid) {
! 		include ("config.inc");
  		$this->aid = $aid;
  		$this->retriever_url = $document_retriever . "?reqtype=getmeta&aid=" . $this->aid."&reqtype=getmeta";
***************
*** 115,118 ****
--- 116,124 ----
  			$this->errormsg = "Error : Failed to open stream!";
  		}
+ 		
+ 		if ($this->metadata['errormessage']) {
+ 			$this->errormsg = "Error from retriever : <a href=\"" . $this->retriever_url . "\">" . $this->metadata['errormessage'] . "</a>";
+ 			$retval = false;
+ 		}
  		return $retval;
  	}
***************
*** 149,160 ****
  			$this->xml_parser_in["filestatus_long"] = true;
  		}
- 		
  		elseif ($name == "CONTENT_CHECKSUM") {
  			$this->xml_parser_in["content_checksum"] = true;
  		}
- 		
  		elseif ($name == "HTTP-HEADER") {
  			$this->xml_parser_in["http-header"] = true;
  		}		
  	}
  
--- 155,168 ----
  			$this->xml_parser_in["filestatus_long"] = true;
  		}
  		elseif ($name == "CONTENT_CHECKSUM") {
  			$this->xml_parser_in["content_checksum"] = true;
  		}
  		elseif ($name == "HTTP-HEADER") {
  			$this->xml_parser_in["http-header"] = true;
  		}		
+ 		elseif ($name == "ERRORMESSAGE") {
+ 			$this->xml_parser_in["errormessage"] = true;
+ 		}		
+ 
  	}
  
***************
*** 195,199 ****
--- 203,211 ----
  		elseif ($name == "HTTP-HEADER") {
  			$this->xml_parser_in["http-header"] = false;
+ 		}
+ 		elseif ($name == "ERRORMESSAGE") {
+ 			$this->xml_parser_in["errormessage"] = true;
  		}		
+ 				
  	}
  
***************
*** 236,240 ****
  		elseif ($this->xml_parser_in["http-header"]) {
  			$this->metadata['http-header'] .= $data;
! 		}			
    }
  }
--- 248,255 ----
  		elseif ($this->xml_parser_in["http-header"]) {
  			$this->metadata['http-header'] .= $data;
! 		}
! 		elseif ($this->xml_parser_in["errormessage"]) {
! 			$this->metadata['errormessage'] .= $data;
! 		}		
    }
  }