[BACK]Return to insertelem.c CVS log [TXT] [DIR] Up to [Public] / Amaya / amaya

Diff for /Amaya/amaya/insertelem.c between versions 1.12 and 1.13

version 1.12, 2007/03/02 10:34:18 version 1.13, 2007/04/25 13:26:52
Line 23 Line 23
 #include "templates_f.h"  #include "templates_f.h"
 #include "templateDeclarations.h"  #include "templateDeclarations.h"
   
 #include "mydictionary_f.h"  
 #include "templateLoad_f.h"  #include "templateLoad_f.h"
 #include "templateDeclarations_f.h"  #include "templateDeclarations_f.h"
 #include "templateInstantiate_f.h"  #include "templateInstantiate_f.h"
Line 122  static void FillUnionResolvedPossibleEle Line 121  static void FillUnionResolvedPossibleEle
   }    }
   else if (dec->nature==UnionNat)    else if (dec->nature==UnionNat)
   {    {
     DLList tempList = ElemList_Create();      DLList          tempList = ElemList_Create();
           ForwardIterator iter = HashMap_GetForwardIterator(dec->unionType.include);
     Record first = dec->unionType.include->first;      HashMapNode     mapnode;
     Record rec = first;      DLListNode      listnode;
       
     int len1 = 0 , len2 = strlen(dec->name);      int len1 = 0 , len2 = strlen(dec->name);
     if (resolvedPath!=NULL)      if (resolvedPath!=NULL)
       len1 = strlen(resolvedPath);        len1 = strlen(resolvedPath);
Line 142  static void FillUnionResolvedPossibleEle Line 141  static void FillUnionResolvedPossibleEle
       strcpy(newPath, dec->name);        strcpy(newPath, dec->name);
     }      }
           
     while(rec)      ITERATOR_FOREACH(iter, DLListNode, listnode)
     {        {
       FillUnionResolvedPossibleElement(t, rec->key, elem, newPath, tempList, level);          FillUnionResolvedPossibleElement(t, (char*)mapnode->key, elem, newPath, tempList, level);
       rec = rec->next;        }
     }      TtaFreeMemory(iter);
           
     ForwardIterator iter = DLList_GetForwardIterator(tempList);      iter = DLList_GetForwardIterator(tempList);
     DLListNode node = (DLListNode) ForwardIterator_GetFirst(iter);      
     while(node)      
     {      listnode = (DLListNode) ForwardIterator_GetFirst(iter);
       DLList_Append(list, node->elem);      for(listnode = (DLListNode) ForwardIterator_GetFirst(iter); listnode;
       node = (DLListNode) ForwardIterator_GetNext(iter);            listnode = (DLListNode) ForwardIterator_GetNext(iter))
     }        DLList_Append(list, listnode->elem);
       TtaFreeMemory(iter);
   
     tempList->destroyElement = NULL;      tempList->destroyElement = NULL;
     DLList_Destroy(tempList);      DLList_Destroy(tempList);
           
Line 266  static void FillInsertableElemList(Docum Line 267  static void FillInsertableElemList(Docum
       doc = TtaGetDocument(elem);        doc = TtaGetDocument(elem);
   
 #ifdef TEMPLATES  #ifdef TEMPLATES
     t = (XTigerTemplate) Dictionary_Get (Templates_Dic, DocumentMeta[doc]->template_url);      t = GetXTigerTemplate(DocumentMeta[doc]->template_url);
 #endif/* TEMPLATES */  #endif/* TEMPLATES */
   
     level = 0;      level = 0;
Removed from v.1.12  
changed lines
  Added in v.1.13

Webmaster