Changeset 15150

Timestamp:

Oct 1, 2007, 11:36:50 AM (19 years ago)

Author:

eugene

Message:

update the CONTENT table distinguishing between chip ID and chip NAME

File:

• trunk/psModules/src/config/pmConfigCamera.c (modified) (3 diffs)

trunk/psModules/src/config/pmConfigCamera.c

@@ -637 +637 @@
                 psMetadata *contents = psMetadataAlloc(); // List of contents, with chipName:chipType
 
+                // XXX this is using the fpaItem->name not the chipName
                 psMetadataIterator *fpaIter = psMetadataIteratorAlloc(fpa, PS_LIST_HEAD, NULL); // Iteratr
                 psMetadataItem *fpaItem;    // Item from iteration
@@ -683 +684 @@
                     return false;
                 }
+
+                // replace chip type with _mosaicChip
+                psMetadataIterator *contentIter = psMetadataIteratorAlloc(contents, PS_LIST_HEAD, NULL); // Iterator
+                psMetadataItem *contentItem;    // Item from iteration
+                while ((contentItem = psMetadataGetAndIncrement(contentIter))) {
+                    assert (contentItem->type == PS_DATA_STRING);
+                    char *ptr = strchr (contentItem->data.str, ':');
+                    assert (ptr);
+                    psString content = psStringNCopy (contentItem->data.str, ptr - contentItem->data.str);
+                    psStringAppend(&content, ":_mosaicChip ");
+                    psFree (contentItem->data.str);
+                    contentItem->data.str = content;                
+                }
+                psFree(contentIter);
+
+                # if (0)
                 while (psListLength(contents->list) > 0) {
                     psMetadataRemoveIndex(contents, PS_LIST_TAIL);
@@ -698 +715 @@
                 }
                 psFree(fpaIter);
+                # endif
 
                 psMetadata *chips = psMetadataAlloc(); // List of chip types, with cellName:cellType