Merge branch 'master' of biuro.biall-net.pl:plabudda/se

# By Piotr Labudda
# Via Piotr Labudda
* 'master' of biuro.biall-net.pl:plabudda/se:
  removed table name prefix from refs

SE/se-lib/Api/WfsDataServer.php

@@ -284,11 +284,7 @@ if($DBG && !empty($geomFld)){echo 'item['.$itemKey.'] ('.$geomFld.')isEmpty('.em
 				if (!$simple) $featureNode->setAttributeNS($rootWfsNsUri, "{$rootWfsNs}:web_link", Request::getPathUri() . "index.php?_route=ViewTableAjax&typeName=p5_{$sourceName}:{$tblName}#EDIT/{$itemKey}");
 					foreach ($fldList as $fldName) {
 						$fldType = $acl->getXsdFieldType($fldName);
-						if ('alias_ref:' == substr($fldType, 0, 10)) {
-							$featureFldNode = $dom->createElementNS($wfsNsUri, "{$wfsNs}:" . $acl->getName() . "__x3A__{$fldName}");
-						} else {
-							$featureFldNode = $dom->createElementNS($wfsNsUri, "{$wfsNs}:{$fldName}");
-						}
+						$featureFldNode = $dom->createElementNS($wfsNsUri, "{$wfsNs}:{$fldName}");
 						if($DBG_DS){echo">>> acl->canReadObjectField('{$fldName}', \$item) ...\n";}
 						if ($acl->canReadObjectField($fldName, (object)$item)) {
 							if ($geomFld != null && $geomFld == $fldName) {

SE/se-lib/Api/WfsServerBase.php

@@ -1370,7 +1370,7 @@ if($DBG){echo 'L.' . __LINE__ . ' $validateConvertedTransactionXsdString:';print
 					$elNode->setAttribute('type', "{$fldName}Type");
 					$elNode->setAttributeNS($rootWfsNsUri, "{$rootWfsNs}:name", $fldName);
 				} else if ('alias_ref:' == substr($fldType, 0, 10)) {
-					$elNode->setAttribute('ref', "p5_" . $acl->getSourceName() . ":" . $acl->getName() . "__x3A__{$fldName}");
+					$elNode->setAttribute('ref', "p5_" . $acl->getSourceName() . ":{$fldName}");
 					$elNode->setAttributeNS($rootWfsNsUri, "{$rootWfsNs}:name", $fldName);
 				} else {
 					$elNode->setAttribute('name', $fldName);
@@ -1407,8 +1407,8 @@ if($DBG){echo 'L.' . __LINE__ . ' $validateConvertedTransactionXsdString:';print
 					// <xsd:element name="{$fldName}" ref="{$localRefType}">
 					$ctNode = $dom->createElementNS('http://www.w3.org/2001/XMLSchema', 'xsd:element');
 					$rootNode->appendChild($ctNode);
-					$ctNode->setAttribute('name', $acl->getName() . "__x3A__{$fldName}");
-					$ctNode->setAttribute('type', "{$localRefType}");
+					$ctNode->setAttribute('name', $fldName);
+					$ctNode->setAttribute('type', $localRefType);
 				} else if ('local_ref:' == substr($fldType, 0, 10)) {
 					$localRefType = substr($fldType, 10);
 					// <xsd:complexType name="produkt_Type">

SE/se-lib/Schema/TestPermsStorageAcl.php

@@ -90,13 +90,11 @@ class Schema_TestPermsStorageAcl extends Core_AclBase {
   public function fetchItemRef(&$items) {
     $DBG = V::get('DBG_DS', 0, $_GET, 'int');
     $refs = array();// fieldName => xsdType
-    $aliasRefs = array();// fieldName => aliasName
     foreach ($this->getRealFieldListByIdZasob() as $id => $fieldName) {
       $fieldType = $this->getXsdFieldType($fieldName);
       if ('ref:' == substr($fieldType, 0, 4)) $refs[$fieldName] = substr($fieldType, 4);
       else if ('alias_ref:' == substr($fieldType, 0, 10)) {
         $refs[$fieldName] = substr($fieldType, 10);
-        $aliasRefs[$fieldName] = $this->getName() . "__x3A__{$fieldName}";
       }
     }
     if (empty($refs)) return $items;
@@ -117,11 +115,7 @@ class Schema_TestPermsStorageAcl extends Core_AclBase {
     }
     foreach ($refRows as $fieldName => $refList) {
       foreach ($refList as $pk => $ref) {
-        // if (array_key_exists($fieldName, $aliasRefs)) {
-        //   $items[ $pk ][ $aliasRefs[$fieldName] ][] = array('xlink' => "{$refs[$fieldName]}.{$ref['REMOTE_PRIMARY_KEY']}");
-        // } else {
-          $items[ $pk ][ $fieldName ][] = array('xlink' => "{$refs[$fieldName]}.{$ref['REMOTE_PRIMARY_KEY']}");
-        // }
+        $items[ $pk ][ $fieldName ][] = array('xlink' => "{$refs[$fieldName]}.{$ref['REMOTE_PRIMARY_KEY']}");
       }
     }
   }