Assistance for das2py moving to 3.0

Author: cpiker

das2/property.c

@@ -303,10 +303,6 @@ bool DasProp_isValid(const DasProp* pProp)
 	return ((pProp != NULL) && (pProp->flags & DASPROP_VALID_MASK));
 }
 
-bool DasProp_isSet(const DasProp* pProp){
-	return ((uint32_t)pProp->flags & DASPROP_SET);
-}
-
 /* 
 const char* DasProp_name(const DasProp* pProp)
 {

das2/property.h

@@ -236,7 +236,14 @@ int DasProp_items(const DasProp* pProp);
 /** Returns true if this property has range multiplicity (aka 2 items) 
  * @memberof DasProp
  */
-#define DasProp_isRange(P) (P->flags & DASPROP_RANGE)
+#define DasProp_isRange(P) ((P->flags & DASPROP_RANGE)==DASPROP_RANGE)
+
+/** Returns true if this property has more then one element (aka a set)
+ * but the set isn't a bounding range.
+ * 
+ * @memberof DasProp
+ */
+#define DasProp_isSet(P) ((P->flags & DASPROP_SET)==DASPROP_SET)
 
 #ifdef __cplusplus
 }

das2/stream.h

@@ -268,10 +268,15 @@ DAS_API DasErrCode DasStream_shadowPktDesc(DasStream* pThis, DasDesc* pDesc, int
 
 /** Take ownership of a dataset (DasDs or PktDesc) 
  * 
- * @param pThis the stream to track the packet desciptor.
+ * The dataset must already be tracked if this stream object, typically by calling
+ * DasStream_shadowPktDesc() earlier on.
  * 
- * @param pDesc a pointer to either a PktDesc or a DasDs, may be NULL if nPktId is set.
+ * Take together, DasStream_shadowPktDesc and DasStream_ownPktDesc has the same
+ * effect as calling DasStream_addPktDesc, but separated the operation into two 
+ * stages
  * 
+ * @param pThis the stream to track the packet desciptor.
+ * @param pDesc a pointer to either a PktDesc or a DasDs, may be NULL if nPktId is set.
  * @param nPktId The ID under which to find the descriptor.  Only used if pDesc is NULL.
  * 
  * @return 0 on success or a positive error code on failure.

das2/units.h

@@ -368,8 +368,8 @@ DAS_API bool Units_haveCalRep(das_units unit);
  *            down time.
  * 
  * @param[in] value the double value representing time from the epoch in some
- *            scale
- 
+ *            scale.
+ *
  * @param[in] epoch_units Unit string
  */
 DAS_API DasErrCode Units_convertToDt(das_time* pDt, double value, das_units epoch_units);

das2/variable.c

@@ -1607,6 +1607,17 @@ int DasVarVecAry_getFrame(const DasVar* pBase)
 	return ((const DasVarVecAry*)pBase)->tplt.frame;
 }
 
+const char* DasVarVecAry_getFrameName(const DasVar* pBase)
+{
+	if(pBase->vartype != D2V_ARRAY) 
+		return NULL;
+
+	if( ((const DasVarArray*)pBase)->varsubtype != D2V_GEOVEC)
+		return NULL;
+
+	return ((const DasVarVecAry*)pBase)->fname;	
+}
+
 const ubyte* DasVarVecAry_getDirs(const DasVar* pBase, ubyte* pNumComp)
 {
 	if(pBase->vartype != D2V_ARRAY) 

das2/variable.h

@@ -599,10 +599,32 @@ DAS_API DasVar* new_DasVarVecAry(
  *          or a negative error code if theres a problem.  All frame IDs are
  *          greater than or equal to 0.
  * 
+ * @throws Does not call das_error if no vector frame is associated with this 
+ *         variable
+ * 
  * @memberof DasVar
  */
 DAS_API int DasVarVecAry_getFrame(const DasVar* pVar);
 
+
+/** Get the name of the vector frame (if any) associated with the variable
+ * 
+ * @param pVar A variable created usind new_DasVarVecAry()
+ * 
+ * @returns the frame name which can be used to access the frame in a DasStream
+ *          or a NULL if this variable is not associated with at frame.  Note
+ *          that the string defined by the macro DASFRM_NULLNAME may have
+ *          been set by a serializer to indicate that this is a vector but has
+ *          no frame definition elsewhere in the stream.
+ * 
+ * @throws Does not call das_error if this is not a vector, or if no frame is
+ *         associated with this vector
+ * 
+ * @memberof DasVar
+ */
+DAS_API const char* DasVarVecAry_getFrameName(const DasVar* pBase);
+
+
 /** Get the component directions in a vector frame
  * 
  * Geometric vectors are defined interms of a coordinate frame.  DasStream