Updated code to reflect changes in DataModel.

This commit is contained in:
Tim McIver 2012-12-12 17:49:56 -05:00
parent d82fc6bb3a
commit c932cbbbc5
2 changed files with 4 additions and 11 deletions

View File

@ -208,13 +208,6 @@ public abstract class AbstractFsContentNode<T extends FsContent> extends Abstrac
*/
public static void fillPropertyMap(Map<String, Object> map, FsContent content) {
// created the dirFlag string
String dirFlagStr = content.isDirNameFlagSet(TSK_FS_NAME_FLAG_ENUM.ALLOC)
? TSK_FS_NAME_FLAG_ENUM.ALLOC.toString() : TSK_FS_NAME_FLAG_ENUM.UNALLOC.toString();
// create the meta flag integer
int metaFlagsInt = TSK_FS_META_FLAG_ENUM.toInt(content.getMetaFlags());
map.put(FsContentPropertyType.NAME.toString(), getFsContentName(content));
map.put(FsContentPropertyType.LOCATION.toString(), DataConversion.getformattedPath(ContentUtils.getDisplayPath(content), 0, 1));
map.put(FsContentPropertyType.MOD_TIME.toString(), ContentUtils.getStringTime(content.getMtime(), content));
@ -222,9 +215,9 @@ public abstract class AbstractFsContentNode<T extends FsContent> extends Abstrac
map.put(FsContentPropertyType.ACCESS_TIME.toString(), ContentUtils.getStringTime(content.getAtime(), content));
map.put(FsContentPropertyType.CREATED_TIME.toString(), ContentUtils.getStringTime(content.getCrtime(), content));
map.put(FsContentPropertyType.SIZE.toString(), content.getSize());
map.put(FsContentPropertyType.FLAGS_DIR.toString(), dirFlagStr);
map.put(FsContentPropertyType.FLAGS_META.toString(), Integer.toString(metaFlagsInt));
map.put(FsContentPropertyType.MODE.toString(), TSK_FS_META_MODE_ENUM.toString(content.getModes(), content.getMetaType()));
map.put(FsContentPropertyType.FLAGS_DIR.toString(), content.getDirFlagAsString());
map.put(FsContentPropertyType.FLAGS_META.toString(), content.getMetaFlagsAsString());
map.put(FsContentPropertyType.MODE.toString(), content.getModesAsString());
map.put(FsContentPropertyType.USER_ID.toString(), content.getUid());
map.put(FsContentPropertyType.GROUP_ID.toString(), content.getGid());
map.put(FsContentPropertyType.META_ADDR.toString(), content.getMetaAddr());

View File

@ -123,7 +123,7 @@ public class ReportBodyFile implements ReportModule {
out.write("|");
out.write(Long.toString(file.getMetaAddr()));
out.write("|");
String modeString = TSK_FS_META_MODE_ENUM.toString(file.getModes(), file.getMetaType());
String modeString = file.getModesAsString();
if(modeString != null) {
out.write(modeString);
}