Update of /cvsroot/stack/stack-1-0/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23253/scripts
Modified Files:
Tag: development_xmlrqp
stackXML.php
Log Message:
Resolving conflicts
Index: stackXML.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/scripts/stackXML.php,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -C2 -d -r1.13 -r1.13.2.1
*** stackXML.php 22 Jul 2005 12:47:41 -0000 1.13
--- stackXML.php 28 Jul 2005 13:57:17 -0000 1.13.2.1
***************
*** 1,4 ****
<?php
!
/**
* Defines XML handling within STACK
--- 1,5 ----
<?php
! require_once('domit/xml_domit_include.php');
!
/**
* Defines XML handling within STACK
[...1017 lines suppressed...]
--- 2395,2398 ----
***************
*** 1429,1432 ****
--- 2404,2408 ----
if($questionField['type']=='other')
{
+ //Check questionfieldkey is either options or potentioal responses, if not echo a warning to the developer
//foreach($arrayKey as
}
***************
*** 1436,1443 ****
{
if(!empty($questionField['doc'])) {
- print_r($arrayKey);
- print_r($questionField['mysql']);
- print_r($questionField['doc']);
-
$xml.=stack_schema_write_element_document($arrayKey,$questionField['mysql'],$questionField['doc']);
}
--- 2412,2415 ----
|
